Skip to content

Commit a22dc3a

Browse files
pcaspersjenkins
authored andcommitted
pass debian tag correctly
1 parent 3ab7dca commit a22dc3a

6 files changed

Lines changed: 7 additions & 6 deletions

Docker/Dockerfile-Boost

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
ARG tag=${DEBIAN_TAG}
2-
FROM debian:${tag}
1+
FROM debian:${debian_tag}
32

43
MAINTAINER Quaternion Risk Management
54
LABEL Description="Provide a base environment for building in C++ with Boost"

Docker/Dockerfile-Boost-Debug

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
ARG tag=:${DEBIAN_TAG}
2-
FROM debian${tag}
1+
FROM debian:${debian_tag}
32

43
MAINTAINER Quaternion Risk Management
54
LABEL Description="Provide a base environment for building in C++ with Boost"

Docker/Dockerfile-Test

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
ARG tag=${DEBIAN_TAG}
2-
FROM debian:${tag}
1+
FROM debian:${debian_tag}
32

43
RUN apt-get update \
54
&& DEBIAN_FRONTEND=noninteractive apt-get install -y dos2unix python3 python3-pip libxml2-utils xsltproc \

Docker/docker-compose-boost-debug.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ services:
1111
- boost_dir=boost_${BOOST_DIR}
1212
- boost_variant=debug
1313
- num_cores=16
14+
- debian_tag=${DEBIAN_TAG}

Docker/docker-compose-boost.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ services:
1010
- boost_version=${BOOST_TAG}
1111
- boost_dir=boost_${BOOST_DIR}
1212
- num_cores=16
13+
- debian_tag=${DEBIAN_TAG}

Docker/docker-compose-test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ services:
66
build:
77
context: .
88
dockerfile: Dockerfile-Test
9+
args:
10+
- debian_tag=${DEBIAN_TAG}

0 commit comments

Comments
 (0)