Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(CI): GitHub deprecated v1 use docker compose instead of docker-compose #51

Merged
merged 1 commit into from
Nov 20, 2024
Merged

fix(CI): GitHub deprecated v1 use docker compose instead of docker-compose #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/deploy-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ jobs:
IMAGE_TAG: prod-${{ github.sha }}
run: |
echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
CURRENT_UID=$(id -u):$(id -g) docker-compose --project-name "common-voice" -f "docker-compose.yaml" build web
docker tag common-voice_web:latest $REGISTRY/$REPOSITORY:$IMAGE_TAG
CURRENT_UID=$(id -u):$(id -g) docker compose --project-name "common-voice" -f "docker-compose.yaml" build web
docker image ls
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed to find the new image's name.

docker tag common-voice-web:latest $REGISTRY/$REPOSITORY:$IMAGE_TAG
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-web instead of _web

docker push $REGISTRY/$REPOSITORY:$IMAGE_TAG

- name: Repository dispatch to trigger deployment
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/stage-deploy-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ jobs:
IMAGE_TAG: stage-${{ github.sha }}
run: |
echo "image_tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
CURRENT_UID=$(id -u):$(id -g) docker-compose --project-name "common-voice" -f "docker-compose.yaml" build web
docker tag common-voice_web:latest $REGISTRY/$REPOSITORY:$IMAGE_TAG
CURRENT_UID=$(id -u):$(id -g) docker compose --project-name "common-voice" -f "docker-compose.yaml" build web
docker image ls
docker tag common-voice-web:latest $REGISTRY/$REPOSITORY:$IMAGE_TAG
docker push $REGISTRY/$REPOSITORY:$IMAGE_TAG

- name: Repository dispatch to trigger deployment
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.override.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
# wget 'https://github.com/docker/compose-cli/releases/download/v1.0.29/docker-linux-amd64'
# CURRENT_UID=$(id -u):$(id -g) ./docker-linux-amd64 --context ecs.common-voice compose --project-name common-voice up

version: '3'

services:
web:
ports:
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
db:
image: mysql:5.7.28
Expand Down