Commit d405095b authored by Benjamin Rokseth's avatar Benjamin Rokseth
Browse files

Kohadev: use build arg and a more sensible name to Koha base image

parent ac80837f
...@@ -9,6 +9,7 @@ services: ...@@ -9,6 +9,7 @@ services:
context: "${KOHAPATH}/kohadev" context: "${KOHAPATH}/kohadev"
dockerfile: Dockerfile dockerfile: Dockerfile
args: args:
KOHA_BASE_IMAGE_TAG: "$KOHA_BASE_IMAGE_TAG"
KOHA_RELEASE: "$KOHA_RELEASE" KOHA_RELEASE: "$KOHA_RELEASE"
networks: networks:
- backend - backend
......
#export KOHA_RELEASE=17.11.04-06-11 # listhistory + deleteditems merge #export KOHA_RELEASE=17.11.04-06-11 # listhistory + deleteditems merge
export KOHA_RELEASE=17.11.04-07-33 # DEPLOY listhistory + deleteditems + purresaker merge export KOHA_RELEASE=17.11.04-07-33 # DEPLOY listhistory + deleteditems + purresaker merge
# KOHA_IMAGE_TAG is only used as basis for building koha_dev image # KOHA_BASE_IMAGE_TAG is only used as basis for building koha_dev image
export KOHA_IMAGE_TAG=844259af2eebd935b6b6fd6e14fd18dd5d0b9304 export KOHA_BASE_IMAGE_TAG=29dcaf95520f2fcbc721ae7563d910830e1d8dc0
export GITREF=$(git rev-parse HEAD) export GITREF=$(git rev-parse HEAD)
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
# Based on debian jessy Koha # Based on debian jessy Koha
# USES a docker image built from GITREF from koha-salt-docker # USES a docker image built from GITREF from koha-salt-docker
####### #######
ARG KOHA_BASE_IMAGE_TAG
FROM digibib/koha:c2735642135d7df4d5d14e01e6f9023055d294a0 FROM digibib/koha:${KOHA_BASE_IMAGE_TAG}
MAINTAINER Oslo Public Library "digitalutvikling@gmail.com" MAINTAINER Oslo Public Library "digitalutvikling@gmail.com"
......
Markdown is supported
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