Unverified Commit 6a2270b1 authored by William Tucker's avatar William Tucker Committed by GitHub
Browse files

Merge pull request #232 from ESGF/upgrade-dind 

Upgrade dind
parents c47aadde 1708aecd

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ variables: 
# Sets up authentication with the configured registry, which defaults to Docker Hub

.dind:

  services:

    - docker:19.03-dind

  image: docker:19.03

    - docker:26.0.0-dind

  image: docker:26.0.0

  variables:

    DOCKER_HOST: tcp://docker:2375

    DOCKER_TLS_CERTDIR: ""
@@ -62,7 +62,7 @@ variables: 
    #   If building master, also tag latest

    - test "$CI_COMMIT_REF_NAME" == "master" && docker tag "$REPOSITORY:$CI_COMMIT_SHORT_SHA" "$REPOSITORY:latest"

    # Push all tags

    - docker push $REPOSITORY

    - docker push --all-tags $REPOSITORY

  only:

    # Only run build jobs for branches in the repo, not MRs

    refs:

images/jdk/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -12,5 +12,5 @@ FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION} 
USER root



RUN dnf makecache && \

    dnf install -y java-11-openjdk-devel-11.0.20.0.8-3.el9 && \

    dnf install -y java-11-openjdk-devel-11.0.22.0.7-2.el9 && \

    dnf clean all

images/jre/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ FROM ${ESGF_REPOSITORY_BASE}/base:${ESGF_IMAGES_VERSION} 
USER root



RUN dnf makecache && \

    dnf install -y java-11-openjdk-headless-11.0.20.0.8-3.el9 && \

    dnf install -y java-11-openjdk-headless-11.0.22.0.7-2.el9 && \

    dnf clean all



USER $ESGF_UID

images/thredds/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ FROM ${ESGF_REPOSITORY_BASE}/jdk:${ESGF_IMAGES_VERSION} as builder 


# Unpack the THREDDS war

ARG THREDDS_VERSION=5.5

ARG THREDDS_SHA1=974979e98ad6cca15b45ccd53ee3f482d1ebb955

ARG THREDDS_SHA1=5d90c5d0e6e2bb49512d01eb5e212f5a7c04855a

ARG THREDDS_URL=https://downloads.unidata.ucar.edu/tds/$THREDDS_VERSION/thredds-$THREDDS_VERSION-SNAPSHOT.war

RUN mkdir /application && \

    cd /application && \