opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update Docker image variable name

Browse source
This commit is contained in:
Oliver Davies 2021-07-16 12:49:42 +01:00
parent 730398421a
commit c9b824cb40
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -1,5 +1,5 @@
COMPOSE_PROJECT_NAME?=oliverdavies-uk COMPOSE_PROJECT_NAME?=oliverdavies-uk
DOCKER_IMAGE_NAME:=ghcr.io/opdavies/$(COMPOSE_PROJECT_NAME)-web DOCKER_WEB_IMAGE_NAME:=ghcr.io/opdavies/$(COMPOSE_PROJECT_NAME)-web
assets-watch: assets-watch:
npm ci npm ci
@ -8,8 +8,8 @@ assets-watch:
build-images: build-images:
docker image build . \ docker image build . \
--file tools/docker/images/Dockerfile \ --file tools/docker/images/Dockerfile \
--tag $(DOCKER_IMAGE_NAME):$(DOCKER_TAG) \ --tag $(DOCKER_WEB_IMAGE_NAME):$(DOCKER_TAG) \
--tag $(DOCKER_IMAGE_NAME):latest \ --tag $(DOCKER_WEB_IMAGE_NAME):latest \
--target=production --target=production
deploy: deploy:
@ -28,8 +28,8 @@ ps:
COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) docker-compose ps COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME) docker-compose ps
push-images: push-images:
docker image push $(DOCKER_IMAGE_NAME):$(DOCKER_TAG) docker image push $(DOCKER_WEB_IMAGE_NAME):$(DOCKER_TAG)
docker image push $(DOCKER_IMAGE_NAME):latest docker image push $(DOCKER_WEB_IMAGE_NAME):latest
.PHONY: * .PHONY: *