Revert "build: try building and pushing with Compose"

This reverts commit fc87e9abd0.
This commit is contained in:
Oliver Davies 2021-10-24 02:46:50 +01:00
parent fc87e9abd0
commit 72a70156ad
2 changed files with 10 additions and 7 deletions

View file

@ -2,11 +2,7 @@ version: '2.4'
services: services:
web: web:
build: image: ghcr.io/opdavies/oliverdavies-uk-web
context: .
dockerfile: tools/docker/images/Dockerfile
target: production
image: "ghcr.io/opdavies/oliverdavies-uk-web:${DOCKER_TAG:-latest}"
ports: ports:
- 80:8080 - 80:8080
restart: unless-stopped restart: unless-stopped

11
run
View file

@ -4,6 +4,8 @@ set -e
. .env . .env
DOCKER_WEB_IMAGE_NAME="ghcr.io/opdavies/${COMPOSE_PROJECT_NAME}-web"
TTY="" TTY=""
if [[ ! -t 1 ]]; then if [[ ! -t 1 ]]; then
TTY="-T" TTY="-T"
@ -19,11 +21,16 @@ function deploy {
} }
function docker:build-images { function docker:build-images {
docker-compose build --file docker-compose-production.yaml docker image build . \
--file tools/docker/images/Dockerfile \
--tag ${DOCKER_WEB_IMAGE_NAME}:${DOCKER_TAG} \
--tag ${DOCKER_WEB_IMAGE_NAME}:latest \
--target=production
} }
function docker:push-images { function docker:push-images {
docker-compose push --file docker-compose-production.yaml docker image push ${DOCKER_WEB_IMAGE_NAME}:${DOCKER_TAG}
docker image push ${DOCKER_WEB_IMAGE_NAME}:latest
} }
function help { function help {