Skip to content

Commit a70b34f

Browse files
jmtcsngrjmtcsngr
authored
Merge pull request #105 from kjsanger/feature/irods-4.3.2
Add iRODS 4.3.2
2 parents 01bf413 + 90cf16d commit a70b34f

File tree

5 files changed

+82
-24
lines changed

5 files changed

+82
-24
lines changed

‎docker/Makefile

Lines changed: 75 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,23 @@ image_names += ub-18.04-irods-4.2.11
2121
image_names += ub-18.04-irods-4.2.12
2222
image_names += ub-18.04-irods-4.3.0
2323
image_names += ub-22.04-irods-4.3.1
24-
image_names += ub-22.04-irods-4.3-nightly
24+
image_names += ub-22.04-irods-4.3.2
25+
# image_names += ub-22.04-irods-4.3-nightly
2526

2627
image_names += ub-16.04-irods-clients-dev-4.2.7
2728
image_names += ub-18.04-irods-clients-dev-4.2.11
2829
image_names += ub-18.04-irods-clients-dev-4.2.12
2930
image_names += ub-18.04-irods-clients-dev-4.3.0
3031
image_names += ub-22.04-irods-clients-dev-4.3.1
31-
image_names += ub-22.04-irods-clients-dev-4.3-nightly
32+
image_names += ub-22.04-irods-clients-dev-4.3.2
33+
# image_names += ub-22.04-irods-clients-dev-4.3-nightly
3234

3335
image_names += ub-16.04-irods-clients-4.2.7
3436
image_names += ub-18.04-irods-clients-4.2.11
3537
image_names += ub-18.04-irods-clients-4.2.12
3638
image_names += ub-22.04-irods-clients-4.3.1
37-
image_names += ub-22.04-irods-clients-4.3-nightly
39+
image_names += ub-22.04-irods-clients-4.3.2
40+
# image_names += ub-22.04-irods-clients-4.3-nightly
3841

3942
git_url=$(shell git remote get-url origin)
4043
git_commit=$(shell git log --pretty=format:'%H' -n 1)
@@ -154,6 +157,20 @@ ub-22.04-irods-4.3.1.$(TAG): irods/ubuntu/22.04/Dockerfile ub-22.04-base.$(TAG)
154157
--tag $(DOCKER_PREFIX)/ub-22.04-irods-4.3.1:$(TAG) --file $< ./irods
155158
touch $@
156159

160+
ub-22.04-irods-4.3.2.$(TAG): irods/ubuntu/22.04/Dockerfile ub-22.04-base.$(TAG)
161+
docker buildx build $(DOCKER_ARGS) \
162+
--load \
163+
--build-arg BASE_IMAGE=$(DOCKER_PREFIX)/ub-22.04-base \
164+
--build-arg IRODS_VERSION=4.3.2 \
165+
--label org.opencontainers.image.title="iRODS 4.3.2 server, Ubuntu 22.04" \
166+
--label org.opencontainers.image.source=$(git_url) \
167+
--label org.opencontainers.image.revision=$(git_commit) \
168+
--label org.opencontainers.image.version=$(TAG) \
169+
--label org.opencontainers.image.created=$(NOW) \
170+
--tag $(DOCKER_PREFIX)/ub-22.04-irods-4.3.2:latest \
171+
--tag $(DOCKER_PREFIX)/ub-22.04-irods-4.3.2:$(TAG) --file $< ./irods
172+
touch $@
173+
157174
ub-22.04-irods-4.3-nightly.$(TAG): irods/ubuntu/22.04/Dockerfile.nightly ub-22.04-base.$(TAG)
158175
docker buildx build $(DOCKER_ARGS) \
159176
--load \
@@ -177,9 +194,9 @@ ub-16.04-irods-clients-4.2.7.$(TAG): irods_clients/ubuntu/16.04/Dockerfile ub-16
177194
--build-arg DOCKER_TAG=$(TAG) \
178195
--build-arg IRODS_VERSION=4.2.7 \
179196
--build-arg BATON_VERSION=4.2.1 \
180-
--build-arg HTSLIB_VERSION=1.18 \
181-
--build-arg SAMTOOLS_VERSION=1.18 \
182-
--build-arg BCFTOOLS_VERSION=1.18 \
197+
--build-arg HTSLIB_VERSION=1.20 \
198+
--build-arg SAMTOOLS_VERSION=1.20 \
199+
--build-arg BCFTOOLS_VERSION=1.20 \
183200
--label org.opencontainers.image.title="iRODS 4.2.7 clients, Ubuntu 16.04" \
184201
--label org.opencontainers.image.source=$(git_url) \
185202
--label org.opencontainers.image.revision=$(git_commit) \
@@ -198,9 +215,9 @@ ub-18.04-irods-clients-4.2.11.$(TAG): irods_clients/ubuntu/18.04/Dockerfile ub-1
198215
--build-arg DOCKER_TAG=$(TAG) \
199216
--build-arg IRODS_VERSION=4.2.11 \
200217
--build-arg BATON_VERSION=4.2.1 \
201-
--build-arg HTSLIB_VERSION=1.18 \
202-
--build-arg SAMTOOLS_VERSION=1.18 \
203-
--build-arg BCFTOOLS_VERSION=1.18 \
218+
--build-arg HTSLIB_VERSION=1.20 \
219+
--build-arg SAMTOOLS_VERSION=1.20 \
220+
--build-arg BCFTOOLS_VERSION=1.20 \
204221
--label org.opencontainers.image.title="iRODS 4.2.11 clients, Ubuntu 18.04" \
205222
--label org.opencontainers.image.source=$(git_url) \
206223
--label org.opencontainers.image.revision=$(git_commit) \
@@ -220,9 +237,9 @@ ub-18.04-irods-clients-4.2.12.$(TAG): irods_clients/ubuntu/18.04/Dockerfile ub-1
220237
--build-arg DOCKER_TAG=$(TAG) \
221238
--build-arg IRODS_VERSION=4.2.12 \
222239
--build-arg BATON_VERSION=4.2.1 \
223-
--build-arg HTSLIB_VERSION=1.18 \
224-
--build-arg SAMTOOLS_VERSION=1.18 \
225-
--build-arg BCFTOOLS_VERSION=1.18 \
240+
--build-arg HTSLIB_VERSION=1.20 \
241+
--build-arg SAMTOOLS_VERSION=1.20 \
242+
--build-arg BCFTOOLS_VERSION=1.20 \
226243
--label org.opencontainers.image.title="iRODS 4.2.12 clients, Ubuntu 18.04" \
227244
--label org.opencontainers.image.source=$(git_url) \
228245
--label org.opencontainers.image.revision=$(git_commit) \
@@ -242,9 +259,9 @@ ub-22.04-irods-clients-4.3.1.$(TAG): irods_clients/ubuntu/22.04/Dockerfile
242259
--build-arg DOCKER_TAG=$(TAG) \
243260
--build-arg IRODS_VERSION=4.3.1 \
244261
--build-arg BATON_VERSION=4.2.1 \
245-
--build-arg HTSLIB_VERSION=1.18 \
246-
--build-arg SAMTOOLS_VERSION=1.18 \
247-
--build-arg BCFTOOLS_VERSION=1.18 \
262+
--build-arg HTSLIB_VERSION=1.20 \
263+
--build-arg SAMTOOLS_VERSION=1.20 \
264+
--build-arg BCFTOOLS_VERSION=1.20 \
248265
--label org.opencontainers.image.title="iRODS 4.3.1 clients, Ubuntu 22.04" \
249266
--label org.opencontainers.image.source=$(git_url) \
250267
--label org.opencontainers.image.revision=$(git_commit) \
@@ -254,6 +271,28 @@ ub-22.04-irods-clients-4.3.1.$(TAG): irods_clients/ubuntu/22.04/Dockerfile
254271
--tag $(DOCKER_PREFIX)/ub-22.04-irods-clients-4.3.1:$(TAG) --file $< ./irods_clients
255272
touch $@
256273

274+
ub-22.04-irods-clients-4.3.2.$(TAG): irods_clients/ubuntu/22.04/Dockerfile
275+
docker buildx build $(DOCKER_ARGS) \
276+
--load \
277+
--build-context singularity=../singularity \
278+
--build-arg DOCKER_PREFIX=$(DOCKER_PREFIX) \
279+
--build-arg BASE_IMAGE=$(DOCKER_PREFIX)/ub-22.04-base \
280+
--build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \
281+
--build-arg DOCKER_TAG=$(TAG) \
282+
--build-arg IRODS_VERSION=4.3.2 \
283+
--build-arg BATON_VERSION=4.2.1 \
284+
--build-arg HTSLIB_VERSION=1.20 \
285+
--build-arg SAMTOOLS_VERSION=1.20 \
286+
--build-arg BCFTOOLS_VERSION=1.20 \
287+
--label org.opencontainers.image.title="iRODS 4.3.2 clients, Ubuntu 22.04" \
288+
--label org.opencontainers.image.source=$(git_url) \
289+
--label org.opencontainers.image.revision=$(git_commit) \
290+
--label org.opencontainers.image.version=$(TAG) \
291+
--label org.opencontainers.image.created=$(NOW) \
292+
--tag $(DOCKER_PREFIX)/ub-22.04-irods-clients-4.3.2:latest \
293+
--tag $(DOCKER_PREFIX)/ub-22.04-irods-clients-4.3.2:$(TAG) --file $< ./irods_clients
294+
touch $@
295+
257296
ub-22.04-irods-clients-4.3-nightly.$(TAG): irods_clients/ubuntu/22.04/Dockerfile.nightly
258297
docker buildx build $(DOCKER_ARGS) \
259298
--load \
@@ -264,9 +303,9 @@ ub-22.04-irods-clients-4.3-nightly.$(TAG): irods_clients/ubuntu/22.04/Dockerfile
264303
--build-arg DOCKER_TAG=$(TAG) \
265304
--build-arg IRODS_VERSION=4.3-nightly \
266305
--build-arg BATON_VERSION=4.2.1 \
267-
--build-arg HTSLIB_VERSION=1.18 \
268-
--build-arg SAMTOOLS_VERSION=1.18 \
269-
--build-arg BCFTOOLS_VERSION=1.18 \
306+
--build-arg HTSLIB_VERSION=1.20 \
307+
--build-arg SAMTOOLS_VERSION=1.20 \
308+
--build-arg BCFTOOLS_VERSION=1.20 \
270309
--label org.opencontainers.image.title="iRODS 4.3-nightly clients, Ubuntu 22.04" \
271310
--label org.opencontainers.image.source=$(git_url) \
272311
--label org.opencontainers.image.revision=$(git_commit) \
@@ -362,6 +401,24 @@ ub-22.04-irods-clients-dev-4.3.1.$(TAG): irods_clients_dev/ubuntu/22.04/Dockerfi
362401
--tag $(DOCKER_PREFIX)/ub-22.04-irods-clients-dev-4.3.1:$(TAG) --file $< ./irods_clients_dev
363402
touch $@
364403

404+
ub-22.04-irods-clients-dev-4.3.2.$(TAG): irods_clients_dev/ubuntu/22.04/Dockerfile
405+
docker buildx build $(DOCKER_ARGS) \
406+
--load \
407+
--build-context singularity=../singularity \
408+
--build-arg DOCKER_PREFIX=$(DOCKER_PREFIX) \
409+
--build-arg BASE_IMAGE=ubuntu:22.04 \
410+
--build-arg IRODS_VERSION=4.3.2 \
411+
--build-arg DOCKER_IMAGE=$(subst .$(TAG),,$@) \
412+
--build-arg DOCKER_TAG=$(TAG) \
413+
--label org.opencontainers.image.title="iRODS 4.3.2 client development, Ubuntu 22.04" \
414+
--label org.opencontainers.image.source=$(git_url) \
415+
--label org.opencontainers.image.revision=$(git_commit) \
416+
--label org.opencontainers.image.version=$(TAG) \
417+
--label org.opencontainers.image.created=$(NOW) \
418+
--tag $(DOCKER_PREFIX)/ub-22.04-irods-clients-dev-4.3.2:latest \
419+
--tag $(DOCKER_PREFIX)/ub-22.04-irods-clients-dev-4.3.2:$(TAG) --file $< ./irods_clients_dev
420+
touch $@
421+
365422
ub-22.04-irods-clients-dev-4.3-nightly.$(TAG): irods_clients_dev/ubuntu/22.04/Dockerfile.nightly
366423
docker buildx build $(DOCKER_ARGS) \
367424
--load \

‎docker/irods/scripts/configure_irods.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ case "$IRODS_VERSION" in
2929
# Logging has been changed to use rsyslog. A potential enhancement is to configure that here.
3030
python3 /var/lib/irods/scripts/setup_irods.py < /opt/docker/irods/config/4.3.x.setup_irods.py.in
3131
;;
32+
4.3.2)
33+
# Logging has been changed to use rsyslog. A potential enhancement is to configure that here.
34+
python3 /var/lib/irods/scripts/setup_irods.py < /opt/docker/irods/config/4.3.x.setup_irods.py.in
35+
;;
3236
*)
3337
echo Unknown iRODS version "$IRODS_VERSION"
3438
exit 1

‎docker/irods/ubuntu/16.04/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ RUN curl -sSL https://packages.irods.org/irods-signing-key.asc | apt-key add - &
3939
irods-server="$IRODS_VERSION" \
4040
irods-runtime="$IRODS_VERSION" \
4141
irods-database-plugin-postgres="$IRODS_VERSION" \
42-
irods-icommands="$IRODS_VERSION" \
43-
irods-dev="$IRODS_VERSION" && \
42+
irods-icommands="$IRODS_VERSION" && \
4443
apt-get install -q -y -f && \
4544
unattended-upgrade -v && \
4645
apt-get remove -q -y unattended-upgrades && \

‎docker/irods/ubuntu/18.04/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ RUN curl -sSL https://packages.irods.org/irods-signing-key.asc | apt-key add - &
4343
irods-server="${IRODS_VERSION}-${IRODS_REVISION}~$(lsb_release -sc)" \
4444
irods-runtime="${IRODS_VERSION}-${IRODS_REVISION}~$(lsb_release -sc)" \
4545
irods-database-plugin-postgres="${IRODS_VERSION}-${IRODS_REVISION}~$(lsb_release -sc)" \
46-
irods-icommands="${IRODS_VERSION}-${IRODS_REVISION}~$(lsb_release -sc)" \
47-
irods-dev="${IRODS_VERSION}-${IRODS_REVISION}~$(lsb_release -sc)" && \
46+
irods-icommands="${IRODS_VERSION}-${IRODS_REVISION}~$(lsb_release -sc)" && \
4847
apt-get install -q -y -f && \
4948
unattended-upgrade -v && \
5049
apt-get remove -q -y unattended-upgrades && \

‎docker/irods/ubuntu/22.04/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ RUN curl -sSL https://packages.irods.org/irods-signing-key.asc | apt-key add - &
4343
irods-server="${IRODS_VERSION}-${IRODS_REVISION}~$(lsb_release -sc)" \
4444
irods-runtime="${IRODS_VERSION}-${IRODS_REVISION}~$(lsb_release -sc)" \
4545
irods-database-plugin-postgres="${IRODS_VERSION}-${IRODS_REVISION}~$(lsb_release -sc)" \
46-
irods-icommands="${IRODS_VERSION}-${IRODS_REVISION}~$(lsb_release -sc)" \
47-
irods-dev="${IRODS_VERSION}-${IRODS_REVISION}~$(lsb_release -sc)" && \
46+
irods-icommands="${IRODS_VERSION}-${IRODS_REVISION}~$(lsb_release -sc)" && \
4847
apt-get install -q -y -f && \
4948
unattended-upgrade -v && \
5049
apt-get remove -q -y unattended-upgrades && \

0 commit comments

Comments
 (0)