bsherriff/aviation
1
1
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Updated tagging

Browse Source
This commit is contained in:
Ben Sherriff
2023-12-19 16:25:11 -05:00
parent 6f002856c1
commit c2e9f4dad0
6 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -13,7 +13,11 @@ help: ## This info
@echo @echo
build: ## Build Docker containers build: ## Build Docker containers
export TAG=${GIT_HASH} && docker compose build docker compose build
tag: ## Tag Docker images
docker tag aviation-ui:latest aviation-ui:${GIT_HASH}
docker tag aviation-service:latest aviation-service:${GIT_HASH}
up: ## Start Docker containers up: ## Start Docker containers
docker compose up -d docker compose up -d

4
docker-compose.yml
View File

@@ -57,8 +57,6 @@ services:
- "${SERVICE_PORT:-5000}:5000" - "${SERVICE_PORT:-5000}:5000"
build: build:
context: service context: service
tags:
- aviation-service:${TAG:-latest}
depends_on: depends_on:
- db - db
- redis - redis
@@ -78,8 +76,6 @@ services:
- ${UI_PORT:-3000}:3000 - ${UI_PORT:-3000}:3000
build: build:
context: ui context: ui
tags:
- aviation-ui:${TAG:-latest}
depends_on: depends_on:
- service - service
networks: networks:

5
service/Makefile
View File

@@ -13,7 +13,10 @@ help: ## This info
@echo @echo
build: ## Build the Docker image build: ## Build the Docker image
export TAG=${GIT_HASH} && docker compose build docker compose build
tag: ## Tag the Docker image
docker tag aviation-service:latest aviation-service:${GIT_HASH}
utils: ## Start the utils utils: ## Start the utils
docker compose up -d db docker compose up -d db

2
service/docker-compose.yml
View File

@@ -63,8 +63,6 @@ services:
- "${SERVICE_PORT:-5000}:5000" - "${SERVICE_PORT:-5000}:5000"
build: build:
context: . context: .
tags:
- aviation-service:${TAG:-latest}
depends_on: depends_on:
- db - db
- redis - redis

5
ui/Makefile
View File

@@ -13,7 +13,10 @@ help: ## This info
@echo @echo
build: ## Install the dependencies and build build: ## Install the dependencies and build
export TAG=${GIT_HASH} && docker compose build docker compose build
tag: ## Tag the Docker image
docker tag aviation-ui:latest aviation-ui:${GIT_HASH}
up: ## Start the dev instance up: ## Start the dev instance
docker compose up -d docker compose up -d

2
ui/docker-compose.yml
View File

@@ -13,8 +13,6 @@ services:
build: build:
context: ./ context: ./
target: dev target: dev
tags:
- aviation-ui:${TAG:-latest}
command: "npm run dev" command: "npm run dev"
volumes: volumes:
- ./src:/app/src - ./src:/app/src