Skip to content

Commit e7e26f6

Browse files
mrnicegyu11kaiser
andauthored
Bump patch version, add jq, bump terraform minor version, bump terraform patch version (#252)
Co-authored-by: kaiser <kaiser@itis.swiss>
1 parent a06a089 commit e7e26f6

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

ci/ciRunsDockerContainer/Dockerfile

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ RUN apt-get update \
4646
&& apt-get install -y --no-install-recommends \
4747
build-essential \
4848
curl \
49-
firefox=114.0+build3-0ubuntu0.20.04.1~mt1 \
49+
firefox=114.0.2+build1-0ubuntu0.20.04.1 \
5050
gettext-base \
5151
git \
52+
jq \
5253
make \
5354
openssl \
5455
openssh-client \
@@ -60,15 +61,17 @@ RUN apt-get update \
6061
&& rm -rf /var/lib/apt/lists/*
6162

6263
# Install minio mc
63-
RUN curl https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2022-10-01T07-56-14Z --create-dirs -o $HOME/minio-binaries/mc \
64+
RUN echo "------------------------------------------------------ minio/mc" \
65+
&& curl https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2022-10-01T07-56-14Z --create-dirs -o $HOME/minio-binaries/mc \
6466
&& chmod +x $HOME/minio-binaries/mc \
6567
&& export PATH=$PATH:$HOME/minio-binaries/
6668

6769
## ASSERT MC WORKS
6870
RUN $HOME/minio-binaries/mc --help
6971

7072
# Install geckodriver
71-
RUN apt install wget -y \
73+
RUN echo "------------------------------------------------------ geckodriver" \
74+
&& apt install wget -y \
7275
&& wget https://github.com/mozilla/geckodriver/releases/download/v0.33.0/geckodriver-v0.33.0-linux64.tar.gz \
7376
&& tar -xvzf geckodriver* \
7477
&& chmod +x geckodriver \
@@ -81,9 +84,9 @@ RUN pip install --no-cache-dir --upgrade \
8184
ansible==6.7.0
8285

8386
RUN echo "------------------------------------------------------ terraform" \
84-
&& cd /tmp && wget https://releases.hashicorp.com/terraform/1.4.4/terraform_1.4.4_linux_amd64.zip \
85-
&& unzip terraform_1.4.4_linux_amd64.zip -d /usr/local/bin \
86-
&& rm /tmp/terraform_1.4.4_linux_amd64.zip
87+
&& cd /tmp && wget https://releases.hashicorp.com/terraform/1.5.1/terraform_1.5.1_linux_amd64.zip \
88+
&& unzip terraform_1.5.1_linux_amd64.zip -d /usr/local/bin \
89+
&& rm /tmp/terraform_1.5.1_linux_amd64.zip
8790

8891
WORKDIR /home/scu
8992

ci/ciRunsDockerContainer/template.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
DOCKER_REGISTRY=itisfoundation
2-
DOCKER_IMAGE_TAG=0.2.0
2+
DOCKER_IMAGE_TAG=0.2.1
33
DOCKER_IMAGE_NAME=ci-provisioned-ubuntu
44
DOCKER_USERNAME=${DOCKER_HUB_LOGIN}
55
DOCKER_PASSWORD=${DOCKER_HUB_PASSWORD}

0 commit comments

Comments
 (0)