Commit f8ec77b8 authored by Steffen Köhler's avatar Steffen Köhler
Browse files

Merge branch 'to-2.36.0' into 'master'

To 2.36.0

See merge request !4
parents f77196b0 319a3d25
Pipeline #4883 passed with stages
in 2 minutes and 15 seconds
......@@ -6,7 +6,8 @@ stages:
- mirror
variables:
production_repo: ubleipzig/folio-okapi
# production_repo: ubleipzig/folio-okapi
production_repo: services.ub.uni-leipzig.de:11443/bdd_dev/folio/okapi
staging_repo: services.ub.uni-leipzig.de:11443/bdd_dev/folio/okapi
alpha_repo: services.ub.uni-leipzig.de:11443/bdd_dev/folio/okapi
DOCKER_TLS_CERTDIR: ""
......@@ -31,7 +32,7 @@ docker_build:
only:
changes:
- Dockerfile
- assets/*
- assets/**/*
docker_publish_alpha:
stage: publish
......@@ -54,7 +55,7 @@ docker_publish_alpha:
- branches
changes:
- Dockerfile
- assets/*
- assets/**/*
except:
- master
......@@ -78,8 +79,40 @@ docker_publish_staging:
- master
changes:
- Dockerfile
- assets/*
- assets/**/*
## Pipeline to publish to docker-hub. Disabled at the moment.
#docker_publish_production:
# stage: publish
# image: ubleipzig/deployer:1.3.2
# services:
# - docker:dind
# script: |
# declare version=`expr "${CI_COMMIT_TAG}" ':' 'release/\(.\+\)'`
# declare major_version=`expr "${version}" ':' '\([^.]\+\)'`
# declare minor_version=`expr "${version}" ':' '[^.]\+\.\([^.]\+\)'`
# declare patch_version=`expr "${version}" ':' '[^.]\+\.[^.]\+\.\([^-]\+\)'`
# declare image_version=`expr "${version}" ':' '[^.]\+\.[^.]\+\.[^-]\+-\(.\+\)'`
# deployer publish \
# --input image.tar.gz \
# --docker-config "${DOCKER_PRODUCTION_AUTH_CONFIG}" \
# --name ${production_repo} \
# --tag latest \
# --tag ${version} \
# --tag "${major_version}.${minor_version}" \
# --tag "${major_version}"
# dependencies:
# - docker_build
# tags:
# - docker
# except:
# - branches
# only:
# refs:
# - /^release\/.*/
## Pipeline to publish to ub internal nexus.
docker_publish_production:
stage: publish
image: ubleipzig/deployer:1.3.2
......@@ -93,7 +126,7 @@ docker_publish_production:
declare image_version=`expr "${version}" ':' '[^.]\+\.[^.]\+\.[^-]\+-\(.\+\)'`
deployer publish \
--input image.tar.gz \
--docker-config "${DOCKER_PRODUCTION_AUTH_CONFIG}" \
--docker-config "${DOCKER_STAGING_AUTH_CONFIG}" \
--name ${production_repo} \
--tag latest \
--tag ${version} \
......
FROM folioorg/okapi:2.33.0
FROM folioorg/okapi:2.36.0
EXPOSE 9130
ENTRYPOINT ["/docker-entrypoint"]
CMD [ "dev" ]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment