diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45d3afd..47bee87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,6 @@ stages: variables: VERSION: latest - AUTO_VERSION: ${CI_COMMIT_TAG:-latest} CACHETAG: build DOCKER_REGISTRY: registry.leenooks.net DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375 @@ -20,7 +19,6 @@ before_script: - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${DOCKER_REGISTRY} - echo "CI_PROJECT_PATH ${CI_PROJECT_PATH} CI_COMMIT_TAG ${CI_COMMIT_TAG} CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME}" - echo "CI_REGISTRY ${CI_REGISTRY} CI_REGISTRY_IMAGE ${CI_REGISTRY_IMAGE} CI ${CI}" -- echo "AUTO_VERSION ${AUTO_VERSION}" test: stage: test diff --git a/Dockerfile b/Dockerfile index 5600be3..3757089 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ RUN yum -y install \ milter-greylist \ && yum clean all -RUN useradd -rc "HUB Mail Relay" -M relay -NG mail -s /sbin/nologin -p SmTpR3l@Y +RUN useradd -rc "HUB Mail Relay" -M relay -NG mail -s /sbin/nologin && echo relay:SmTpR3l@Y | chpasswd EXPOSE 25