diff --git a/.github/docker-image-build.sh b/.github/docker-image-build.sh index e57ad0d..d4adeb3 100755 --- a/.github/docker-image-build.sh +++ b/.github/docker-image-build.sh @@ -13,7 +13,3 @@ for DOCKER_IMAGE in ${DOCKER_IMAGES}; do echo "Build Zammad Docker image ${DOCKER_IMAGE} with version ${DOCKER_IMAGE_TAG} for local test" docker build --pull --no-cache --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" -t "${DOCKER_IMAGE}-${DOCKER_IMAGE_TAG}" -f "containers/${DOCKER_IMAGE}/Dockerfile" . done - -# change images in compose file -# shellcheck disable=SC2016 -sed -i -e 's#image: ${IMAGE_REPO}:##g' -e 's#${VERSION}#-ci-snapsoht#g'< docker-compose.yml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 737f237..173b635 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -32,7 +32,7 @@ jobs: with: dockerfile: containers/zammad-postgresql/Dockerfile - test-docker-compose: + build-and-run-docker-compose: needs: - lint-bash-scripts - lint-docker-files @@ -44,7 +44,7 @@ jobs: - name: build docker containers run: .github/docker-image-build.sh - name: use images build by ci - run: sed -i -e 's#VERSION=.*#VERSION=-ci-snapshot#g' < .env + run: "sed -i -e 's#image: ${IMAGE_REPO}:##g' -e 's#${VERSION}#-ci-snapsoht#g'< docker-compose.yml" - name: run docker-compose up run: docker-compose up --detach - name: add autowizard file