From 6464f2fb5161314b7cec6177ab2c372df675cd30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <monotek23@gmail.com>
Date: Fri, 6 Mar 2020 15:45:50 +0100
Subject: [PATCH] github action test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: André Bauer <monotek23@gmail.com>
---
 .github/docker-image-build.sh | 5 ++---
 .github/workflows/ci.yaml     | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/docker-image-build.sh b/.github/docker-image-build.sh
index d4adeb3..f9c09e4 100755
--- a/.github/docker-image-build.sh
+++ b/.github/docker-image-build.sh
@@ -6,10 +6,9 @@ set -o errexit
 set -o pipefail
 
 DOCKER_IMAGES="zammad zammad-elasticsearch zammad-postgresql"
-DOCKER_IMAGE_TAG="ci-snapshot"
 
 # shellcheck disable=SC2153
 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" .
+  echo "Build Zammad Docker image ${DOCKER_IMAGE} for local test"
+  docker build --pull --no-cache --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" -t "${DOCKER_IMAGE}" -f "containers/${DOCKER_IMAGE}/Dockerfile" .
 done
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 40cdc55..8b24cf8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -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#image: ${IMAGE_REPO}:##g' -e 's#${VERSION}#-ci-snapsoht#g' docker-compose.yml"
+        run: "sed -i -e 's#image: ${IMAGE_REPO}:##g' -e 's#${VERSION}##g' docker-compose.yml"
       - name: run docker-compose up
         run: docker-compose up --detach
       - name: add autowizard file