Skip to content

Commit

Permalink
Gh-366: Upgrade docker images (#367)
Browse files Browse the repository at this point in the history
* Upgrade gaffer-rest images
Replaced deprecated openjdk image with azul replacement

* Upgrade Ubuntu images to latest

* Upgrade Maven images

* Upgrade gaffer-road-traffic-loader images
Replaced deprecated openjdk image with azul version

* Upgrade python image to latest patch version

* Upgrade jhub-options-server

* Update Copyright
  • Loading branch information
GCHQDeveloper314 authored Jun 4, 2024
1 parent 35e076a commit 7d445dd
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions docker/accumulo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2023 Crown Copyright
# Copyright 2020-2024 Crown Copyright
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -13,10 +13,10 @@
# limitations under the License.

ARG BUILDER_IMAGE_NAME=ubuntu
ARG BUILDER_IMAGE_TAG=focal-20230412
ARG BUILDER_IMAGE_TAG=noble-20240429

ARG BASE_IMAGE_NAME=ubuntu
ARG BASE_IMAGE_TAG=focal-20230412
ARG BASE_IMAGE_TAG=noble-20240429

ARG ACCUMULO_VERSION=2.0.1
ARG HADOOP_VERSION=3.3.3
Expand Down
4 changes: 2 additions & 2 deletions docker/gaffer-integration-tests/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2023 Crown Copyright
# Copyright 2021-2024 Crown Copyright
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
# limitations under the License.

ARG BUILDER_IMAGE_NAME=maven
ARG BUILDER_IMAGE_TAG=3.8.4-jdk-8
ARG BUILDER_IMAGE_TAG=3.9-eclipse-temurin-8

FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG}
ARG GAFFER_GIT_REPO=https://github.com/gchq/Gaffer.git
Expand Down
4 changes: 2 additions & 2 deletions docker/gaffer-jhub-options-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Crown Copyright
# Copyright 2022-2024 Crown Copyright
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM node:16.16.0-alpine3.15
FROM node:16.20.2-alpine3.17

WORKDIR /srv/app
COPY package.json ./
Expand Down
4 changes: 2 additions & 2 deletions docker/gaffer-kerberos/kdc/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022-2023 Crown Copyright
# Copyright 2022-2024 Crown Copyright
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
# limitations under the License.

ARG BASE_IMAGE_NAME=ubuntu
ARG BASE_IMAGE_TAG=focal-20230412
ARG BASE_IMAGE_TAG=noble-20240429

FROM ${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}

Expand Down
6 changes: 3 additions & 3 deletions docker/gaffer-rest/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
# limitations under the License.

ARG BUILDER_IMAGE_NAME=maven
ARG BUILDER_IMAGE_TAG=3.8.4-jdk-8
ARG BUILDER_IMAGE_TAG=3.9-eclipse-temurin-8

ARG BASE_IMAGE_NAME=openjdk
ARG BASE_IMAGE_TAG=8-jre-alpine
ARG BASE_IMAGE_NAME=azul/zulu-openjdk-alpine
ARG BASE_IMAGE_TAG=8-latest

FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder

Expand Down
6 changes: 3 additions & 3 deletions docker/gaffer-road-traffic-loader/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
# limitations under the License.

ARG BUILDER_IMAGE_NAME=maven
ARG BUILDER_IMAGE_TAG=3.8.4-jdk-8
ARG BUILDER_IMAGE_TAG=3.9-eclipse-temurin-8

ARG BASE_IMAGE_NAME=openjdk
ARG BASE_IMAGE_TAG=8u322-jre-slim-bullseye
ARG BASE_IMAGE_NAME=azul/zulu-openjdk-debian
ARG BASE_IMAGE_TAG=8-jre-headless-latest

FROM ${BUILDER_IMAGE_NAME}:${BUILDER_IMAGE_TAG} as builder

Expand Down
2 changes: 1 addition & 1 deletion docker/gaffer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

ARG BUILDER_IMAGE_NAME=maven
ARG BUILDER_IMAGE_TAG=3.8.4-jdk-8
ARG BUILDER_IMAGE_TAG=3.9-eclipse-temurin-8

ARG BASE_IMAGE_NAME=gchq/accumulo
ARG BASE_IMAGE_TAG=2.0.1
Expand Down
6 changes: 3 additions & 3 deletions docker/hdfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020-2023 Crown Copyright
# Copyright 2020-2024 Crown Copyright
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -13,10 +13,10 @@
# limitations under the License.

ARG BUILDER_IMAGE_NAME=ubuntu
ARG BUILDER_IMAGE_TAG=focal-20230412
ARG BUILDER_IMAGE_TAG=noble-20240429

ARG BASE_IMAGE_NAME=ubuntu
ARG BASE_IMAGE_TAG=focal-20230412
ARG BASE_IMAGE_TAG=noble-20240429

ARG HADOOP_VERSION=3.3.3

Expand Down
4 changes: 2 additions & 2 deletions docker/spark-py/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2020 Crown Copyright
# Copyright 2020-2024 Crown Copyright
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -13,7 +13,7 @@
# limitations under the License.

ARG BASE_IMAGE_NAME=python
ARG BASE_IMAGE_TAG=3.9.7-slim
ARG BASE_IMAGE_TAG=3.9-slim-bullseye

FROM ${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}

Expand Down

0 comments on commit 7d445dd

Please sign in to comment.