Use the correct docker repo domain

This commit is contained in:
maurizio vitale
2019-08-28 13:47:00 +01:00
parent 29533e751d
commit 329a8a5348
2 changed files with 2 additions and 24 deletions

View File

@@ -105,13 +105,7 @@ jobs:
script:
- TAG_VERSION=$(./scripts/travis/deploy/tag-travis-branch.sh)
- echo "Running the docker with tag" $TAG_VERSION
- docker login -u="$DOCKER_REPOSITORY_USER" -p="$DOCKER_REPOSITORY_PASSWORD" "$DOCKER_REPOSITORY_DOMAIN"
- echo docker build -t=$DOCKER_REPOSITORY:$TAG_VERSION .
- docker build -t=$DOCKER_REPOSITORY:$TAG_VERSION .
- echo docker tag $DOCKER_REPOSITORY:$TAG_VERSION $DOCKER_REPOSITORY:$TAG_VERSION
- docker tag $DOCKER_REPOSITORY:$TAG_VERSION $DOCKER_REPOSITORY:$TAG_VERSION
- echo docker push $DOCKER_REPOSITORY
- docker push $DOCKER_REPOSITORY
- ./lib/dist/cli/bin/adf-cli docker-publish --loginCheck --loginUsername "$DOCKER_REPOSITORY_USER" --loginPassword "$DOCKER_REPOSITORY_PASSWORD" --loginRepo "$DOCKER_REPOSITORY_DOMAIN" --dockerRepo "$DOCKER_REPOSITORY" --dockerTags "$TAG_VERSION" --pathProject "$(pwd)"
- stage: Update Rancher
script:
- TAG_VERSION=$(./scripts/travis/deploy/tag-travis-branch.sh)

View File

@@ -13,13 +13,6 @@ RUN mkdir -p ./licenses && \
FROM nginx:stable-alpine
LABEL version="3.0.0"
ARG GROUPNAME=Alfresco
ARG GROUPID=1000
ARG USERNAME=adf
ARG USERID=33011
ARG BUILD_NUMBER
COPY ./docker/nginx.conf /etc/nginx/nginx.conf
COPY ./docker/entrypoint.sh /
@@ -27,15 +20,6 @@ WORKDIR /usr/share/nginx/html
COPY demo-shell/dist/ .
COPY --from=builder /usr/src/alfresco/licenses ./licenses
RUN addgroup -g ${GROUPID} ${GROUPNAME} && \
adduser -S -u ${USERID} -G ${GROUPNAME} -s "/bin/bash" ${USERNAME} && \
chown -R ${USERNAME}:${GROUPNAME} ./${BUILD_NUMBER}/app.config.json && \
chown -R ${USERNAME}:${GROUPNAME} /var/cache/nginx && \
touch /var/run/nginx.pid && \
chown -R ${USERNAME}:${GROUPNAME} /var/run/nginx.pid && \
chmod +x /entrypoint.sh && \
chown -R ${USERNAME}:${GROUPNAME} /entrypoint.sh
EXPOSE 8080
USER ${USERNAME}
ENTRYPOINT [ "/entrypoint.sh" ]