Skip to content

Commit

Permalink
Update the e2edev-test container's base os from ubuntu 18.04 to 22.04
Browse files Browse the repository at this point in the history
Signed-off-by: Max McAdam <max@fredcom.com>
  • Loading branch information
MaxMcAdam committed Jun 12, 2024
1 parent 71365b2 commit d6b0005
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions test/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:24.04

ARG ARCH

Expand All @@ -7,6 +7,7 @@ RUN apt-get update \

ARG DOCKER_VER=19.03.8
ARG GO_VER=1.21.3
ARG VAULT_VER=1.14.8-1

# install docker cli
RUN curl -4fsSLO https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VER}.tgz \
Expand All @@ -17,7 +18,7 @@ RUN curl https://dl.google.com/go/go${GO_VER}.linux-amd64.tar.gz | tar -xzf- -C

RUN curl -4fsSL https://apt.releases.hashicorp.com/gpg | apt-key add - && \
apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" && \
apt-get update && apt-get -y install vault ;
apt-get update && apt-get -y install vault=${VAULT_VER} ;

ENV GOROOT=/usr/local/go
ENV PATH="${PATH}:${GOROOT}/bin"
Expand Down
8 changes: 4 additions & 4 deletions test/gov/sync_service_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -323,10 +323,10 @@ else
fi

#Create custom key pairs
openssl genrsa -out /tmp/mms.private.key 2048
openssl rsa -in /tmp/mms.private.key -outform PEM -pubout -out /tmp/mms.public.key
openssl genrsa -out /tmp/env.private.key 2048
openssl rsa -in /tmp/env.private.key -outform PEM -pubout -out /tmp/env.public.key
openssl genrsa -traditional -out /tmp/mms.private.key 2048
openssl rsa -traditional -in /tmp/mms.private.key -outform PEM -pubout -out /tmp/mms.public.key
openssl genrsa -traditional -out /tmp/env.private.key 2048
openssl rsa -traditional -in /tmp/env.private.key -outform PEM -pubout -out /tmp/env.public.key
MADE_DEFAULT_KEYS=0
if [ ! -f ~/.hzn/keys/service.private.key ] || [ ! -f ~/.hzn/keys/service.public.pem ];
then
Expand Down

0 comments on commit d6b0005

Please sign in to comment.