fix: Fixed ci workflow
This commit is contained in:
@@ -71,26 +71,7 @@ jobs:
|
||||
fi
|
||||
}
|
||||
|
||||
# shared/ is gone from this repository: it is the private
|
||||
# module gitea.hostxtra.co.uk/vantage/vantage-shared, pinned
|
||||
# per service in its own go.mod. A change over there reaches
|
||||
# a service when somebody bumps that pin, which is a commit
|
||||
# under the service's own directory and so already matches
|
||||
# below. There is no longer a directory whose change fans out
|
||||
# to three images, and no longer a way to ship a service
|
||||
# against a shared/ it was never built with.
|
||||
#
|
||||
# proto/ is gone too. It documents the wire types, and it
|
||||
# moved to sit beside the hand-written pb it describes, so
|
||||
# that a message added to one is added to the other in the
|
||||
# same commit. Nothing here reads it.
|
||||
flag server '^(server/|default_steps/|go\.work)'
|
||||
|
||||
# web/ uses its own directory as the build context, so
|
||||
# nothing outside it can affect it. It is the only front end
|
||||
# left here: the marketing site and the docs went to
|
||||
# vantage-site and vantage-docs, the HQ console to
|
||||
# vantage-admin.
|
||||
flag server '^(server/|default_steps/)'
|
||||
flag web '^web/'
|
||||
|
||||
# vantage-shared is private, so every Go build below needs a
|
||||
@@ -140,7 +121,7 @@ jobs:
|
||||
- name: Build and push server image
|
||||
if: steps.changed.outputs.server == 'true'
|
||||
run: |
|
||||
IMAGE="${{ vars.DOCKER_HOST }}/${{ github.repository_owner }}/vantage/server:latest"
|
||||
IMAGE="${{ vars.DOCKER_HOST }}/${{ github.repository_owner }}/vantage-app/server:latest"
|
||||
docker build --secret id=netrc,src="$HOME/.netrc" \
|
||||
-t "$IMAGE" -f server/Dockerfile .
|
||||
docker push "$IMAGE"
|
||||
@@ -148,10 +129,9 @@ jobs:
|
||||
- name: Build and push web image
|
||||
if: steps.changed.outputs.web == 'true'
|
||||
run: |
|
||||
IMAGE="${{ vars.DOCKER_HOST }}/${{ github.repository_owner }}/vantage/web:latest"
|
||||
IMAGE="${{ vars.DOCKER_HOST }}/${{ github.repository_owner }}/vantage-app/web:latest"
|
||||
docker build \
|
||||
--build-arg NEXT_PUBLIC_HQ_URL="${{ vars.HQ_URL }}" \
|
||||
-t "$IMAGE" \
|
||||
-f web/Dockerfile web/
|
||||
docker push "$IMAGE"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user