fixed docker lint file paths
This commit is contained in:
André Bauer
parent
aad03052f7
commit
6f26f26185
2
.env
2
.env
@ -1,6 +1,6 @@
|
||||
# don't forget to add the minus before the version
|
||||
IMAGE_REPO=zammad/zammad-docker-compose
|
||||
POSTGRES_PASS=zammad
|
||||
POSTGRES_USER=zammad
|
||||
RESTART=always
|
||||
# don't forget to add the minus before the version
|
||||
VERSION=-3.3.0-6
|
||||
|
||||
6
.github/workflows/ci.yaml
vendored
6
.github/workflows/ci.yaml
vendored
@ -22,15 +22,15 @@ jobs:
|
||||
- name: lint zammad dockerfile
|
||||
uses: brpaz/hadolint-action@master
|
||||
with:
|
||||
dockerfile: containers/zammad-elasticsearch/Dockerfile
|
||||
dockerfile: containers/zammad/Dockerfile
|
||||
- name: lint elasticsearch dockerfile
|
||||
uses: brpaz/hadolint-action@master
|
||||
with:
|
||||
dockerfile: containers/zammad-postgresql/Dockerfile
|
||||
dockerfile: containers/zammad-elasticsearch/Dockerfile
|
||||
- name: lint postgresql dockerfile
|
||||
uses: brpaz/hadolint-action@master
|
||||
with:
|
||||
dockerfile: containers/zammad/Dockerfile
|
||||
dockerfile: containers/zammad-postgresql/Dockerfile
|
||||
|
||||
test-docker-compose:
|
||||
timeout-minutes: 10
|
||||
|
||||
73
3.3.diff
73
3.3.diff
@ -1,73 +0,0 @@
|
||||
diff --git a/.env b/.env
|
||||
index 5cbee27..81670e9 100644
|
||||
--- a/.env
|
||||
+++ b/.env
|
||||
@@ -3,4 +3,4 @@ IMAGE_REPO=zammad/zammad-docker-compose
|
||||
POSTGRES_PASS=zammad
|
||||
POSTGRES_USER=zammad
|
||||
RESTART=always
|
||||
-VERSION=-3.2.0-13
|
||||
+VERSION=-3.3.0-6
|
||||
diff --git a/Dockerfile b/Dockerfile
|
||||
index b5001d1..9e824ad 100644
|
||||
--- a/Dockerfile
|
||||
+++ b/Dockerfile
|
||||
@@ -8,5 +8,5 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
|
||||
org.label-schema.vcs-url="https://github.com/zammad/zammad" \
|
||||
org.label-schema.vcs-type="Git" \
|
||||
org.label-schema.vendor="Zammad" \
|
||||
- org.label-schema.schema-version="3.2.0" \
|
||||
+ org.label-schema.schema-version="3.3.0" \
|
||||
org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
|
||||
diff --git a/README.md b/README.md
|
||||
index 28eb778..8604c73 100644
|
||||
--- a/README.md
|
||||
+++ b/README.md
|
||||
@@ -42,7 +42,7 @@ Like this, you can add your `docker-compose.prod.yml` to a branch of your Git re
|
||||
|
||||
## Upgrading
|
||||
|
||||
-### From =< 3.2.0-12
|
||||
+### From =< 3.3.0-12
|
||||
|
||||
We've updated the Elasticsearch image from 5.6 to 7.6.
|
||||
As there is no direct upgrade path we have to delete all Elasticsearch indicies and rebuild them.
|
||||
diff --git a/containers/zammad-elasticsearch/Dockerfile b/containers/zammad-elasticsearch/Dockerfile
|
||||
index 4c105d2..f20aceb 100644
|
||||
--- a/containers/zammad-elasticsearch/Dockerfile
|
||||
+++ b/containers/zammad-elasticsearch/Dockerfile
|
||||
@@ -9,7 +9,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
|
||||
org.label-schema.vcs-url="https://github.com/zammad/zammad" \
|
||||
org.label-schema.vcs-type="Git" \
|
||||
org.label-schema.vendor="Zammad" \
|
||||
- org.label-schema.schema-version="3.2.0" \
|
||||
+ org.label-schema.schema-version="3.3.0" \
|
||||
org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
|
||||
|
||||
SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
|
||||
diff --git a/containers/zammad-postgresql/Dockerfile b/containers/zammad-postgresql/Dockerfile
|
||||
index bacf81c..3904638 100644
|
||||
--- a/containers/zammad-postgresql/Dockerfile
|
||||
+++ b/containers/zammad-postgresql/Dockerfile
|
||||
@@ -10,7 +10,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
|
||||
org.label-schema.vcs-url="https://github.com/zammad/zammad" \
|
||||
org.label-schema.vcs-type="Git" \
|
||||
org.label-schema.vendor="Zammad" \
|
||||
- org.label-schema.schema-version="3.2.0" \
|
||||
+ org.label-schema.schema-version="3.3.0" \
|
||||
org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
|
||||
|
||||
SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"]
|
||||
diff --git a/containers/zammad/Dockerfile b/containers/zammad/Dockerfile
|
||||
index 8fb92f5..40ae4be 100644
|
||||
--- a/containers/zammad/Dockerfile
|
||||
+++ b/containers/zammad/Dockerfile
|
||||
@@ -37,7 +37,7 @@ LABEL org.label-schema.build-date="$BUILD_DATE" \
|
||||
org.label-schema.vcs-url="https://github.com/zammad/zammad" \
|
||||
org.label-schema.vcs-type="Git" \
|
||||
org.label-schema.vendor="Zammad" \
|
||||
- org.label-schema.schema-version="3.2.0" \
|
||||
+ org.label-schema.schema-version="3.3.0" \
|
||||
org.label-schema.docker.cmd="sysctl -w vm.max_map_count=262144;docker-compose up"
|
||||
|
||||
ENV GIT_BRANCH stable
|
||||
37
hooks/build
37
hooks/build
@ -1,37 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# build hook for dockerhubs autobuild feature
|
||||
#
|
||||
|
||||
set -e
|
||||
|
||||
. "hooks/config"
|
||||
|
||||
#shellcheck disable=SC2153
|
||||
for DOCKER_IMAGE in ${DOCKER_IMAGES}; do
|
||||
if [ "${TRAVIS}" == 'true' ] || [ "${CIRCLECI}" == 'true' ]; then
|
||||
|
||||
if [ -n "${ZAMMAD_VERSION}" ]; then
|
||||
DOCKER_TAG="-t ${DOCKER_REGISTRY}/${GITHUB_USERNAME}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE}-${ZAMMAD_VERSION}"
|
||||
else
|
||||
ZAMMAD_VERSION="latest"
|
||||
fi
|
||||
|
||||
echo "Build Zammad Docker image ${DOCKER_IMAGE} with version ${ZAMMAD_VERSION} for DockerHubs ${DOCKER_REGISTRY}/${GITHUB_USERNAME}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE} repo"
|
||||
|
||||
docker build --pull --no-cache --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" -t ${DOCKER_REGISTRY}/${GITHUB_USERNAME}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE} -t ${DOCKER_REGISTRY}/${GITHUB_USERNAME}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE}-latest ${DOCKER_TAG} -f containers/${DOCKER_IMAGE}/Dockerfile .
|
||||
|
||||
docker push ${DOCKER_REGISTRY}/${GITHUB_USERNAME}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE}
|
||||
docker push ${DOCKER_REGISTRY}/${GITHUB_USERNAME}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE}-latest
|
||||
|
||||
if [ "${ZAMMAD_VERSION}" != "latest" ]; then
|
||||
docker push ${DOCKER_REGISTRY}/${GITHUB_USERNAME}/${DOCKER_REPOSITORY}:${DOCKER_IMAGE}-${ZAMMAD_VERSION}
|
||||
fi
|
||||
else
|
||||
echo "Build Zammad Docker image ${DOCKER_IMAGE} for DockerHubs ${DOCKER_REPO}:${DOCKER_IMAGE} repo"
|
||||
|
||||
docker build --pull --no-cache --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" -t "${DOCKER_REPO}:${DOCKER_IMAGE}" -f containers/"${DOCKER_IMAGE}"/Dockerfile .
|
||||
|
||||
docker push ${DOCKER_REPO}:${DOCKER_IMAGE}
|
||||
fi
|
||||
done
|
||||
@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# build hooks config
|
||||
#
|
||||
|
||||
DOCKER_IMAGES="zammad zammad-elasticsearch zammad-postgresql"
|
||||
@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# build hook for dockerhubs autobuild feature
|
||||
#
|
||||
|
||||
exit 0
|
||||
Loading…
Reference in New Issue
Block a user