fix for docker-compose image and container_name
This commit is contained in:
@@ -80,7 +80,7 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo "${{ secrets.REGISTRY_PASSWORD }}" | \
|
echo "${{ secrets.REGISTRY_PASSWORD }}" | \
|
||||||
docker login ${{ env.REGISTRY }} -u ${{ secrets.REGISTRY_USER }} --password-stdin
|
docker login ${{ env.REGISTRY }} -u ${{ secrets.REGISTRY_USER }} --password-stdin
|
||||||
|
|
||||||
mkdir -p "/app-cache/${{ gitea.repository }}"
|
mkdir -p "/app-cache/${{ gitea.repository }}"
|
||||||
cd "/app-cache/${{ gitea.repository }}"
|
cd "/app-cache/${{ gitea.repository }}"
|
||||||
if [ ! -d .git ]; then
|
if [ ! -d .git ]; then
|
||||||
@@ -90,9 +90,11 @@ jobs:
|
|||||||
git checkout -f FETCH_HEAD
|
git checkout -f FETCH_HEAD
|
||||||
git reset --hard FETCH_HEAD
|
git reset --hard FETCH_HEAD
|
||||||
git clean -fdx
|
git clean -fdx
|
||||||
printf 'REGISTRY=%s\nIMAGE_PREFIX=%s\n' \
|
printf 'REGISTRY=%s\nIMAGE_PREFIX=%s\nIMAGE_TAG=%s\nSERVICE_NAME=%s\n' \
|
||||||
'${{ env.REGISTRY }}' \
|
'${{ env.REGISTRY }}' \
|
||||||
'${{ needs.build-app.outputs.IMAGE_PREFIX }}' > .env
|
'${{ needs.build-app.outputs.IMAGE_PREFIX }}' \
|
||||||
|
'${{ gitea.sha }}' \
|
||||||
|
"$(basename '${{ needs.build-app.outputs.IMAGE_PREFIX }}')" > .env
|
||||||
/data/tools/docker-compose pull
|
/data/tools/docker-compose pull
|
||||||
/data/tools/docker-compose up -d --remove-orphans
|
/data/tools/docker-compose up -d --remove-orphans
|
||||||
docker image prune -f
|
docker image prune -f
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
services:
|
services:
|
||||||
server:
|
server:
|
||||||
image: ${CI_REGISTRY_IMAGE:-claudemcp}/app:${CI_COMMIT_SHA:-latest}
|
image: ${REGISTRY}/${IMAGE_PREFIX}/app:latest
|
||||||
container_name: ${CI_REGISTRY_IMAGE:-claudemcp}
|
container_name: ${SERVICE_NAME}
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "${APP_PORT:-3000}:3000"
|
- "${APP_PORT:-3000}:3000"
|
||||||
|
|||||||
Reference in New Issue
Block a user