build: try building and pushing with Compose

This commit is contained in:
Oliver Davies 2021-10-24 02:42:55 +01:00
parent 6a3f3eaa99
commit fc87e9abd0
2 changed files with 7 additions and 10 deletions

View file

@ -2,7 +2,11 @@ version: '2.4'
services: services:
web: web:
image: ghcr.io/opdavies/oliverdavies-uk-web build:
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,8 +4,6 @@ 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"
@ -21,16 +19,11 @@ function deploy {
} }
function docker:build-images { function docker:build-images {
docker image build . \ docker-compose build --file docker-compose-production.yaml
--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 image push ${DOCKER_WEB_IMAGE_NAME}:${DOCKER_TAG} docker-compose push --file docker-compose-production.yaml
docker image push ${DOCKER_WEB_IMAGE_NAME}:latest
} }
function help { function help {