Skip to content

Commit

Permalink
Bump patch version, add jq, bump terraform minor version, bump terraf…
Browse files Browse the repository at this point in the history
…orm patch version (#252)

Co-authored-by: kaiser <[email protected]>
  • Loading branch information
mrnicegyu11 and kaiser authored Jun 27, 2023
1 parent a06a089 commit e7e26f6
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
15 changes: 9 additions & 6 deletions ci/ciRunsDockerContainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends \
build-essential \
curl \
firefox=114.0+build3-0ubuntu0.20.04.1~mt1 \
firefox=114.0.2+build1-0ubuntu0.20.04.1 \
gettext-base \
git \
jq \
make \
openssl \
openssh-client \
Expand All @@ -60,15 +61,17 @@ RUN apt-get update \
&& rm -rf /var/lib/apt/lists/*

# Install minio mc
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 \
RUN echo "------------------------------------------------------ minio/mc" \
&& 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 \
&& chmod +x $HOME/minio-binaries/mc \
&& export PATH=$PATH:$HOME/minio-binaries/

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

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

RUN echo "------------------------------------------------------ terraform" \
&& cd /tmp && wget https://releases.hashicorp.com/terraform/1.4.4/terraform_1.4.4_linux_amd64.zip \
&& unzip terraform_1.4.4_linux_amd64.zip -d /usr/local/bin \
&& rm /tmp/terraform_1.4.4_linux_amd64.zip
&& cd /tmp && wget https://releases.hashicorp.com/terraform/1.5.1/terraform_1.5.1_linux_amd64.zip \
&& unzip terraform_1.5.1_linux_amd64.zip -d /usr/local/bin \
&& rm /tmp/terraform_1.5.1_linux_amd64.zip

WORKDIR /home/scu

Expand Down
2 changes: 1 addition & 1 deletion ci/ciRunsDockerContainer/template.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DOCKER_REGISTRY=itisfoundation
DOCKER_IMAGE_TAG=0.2.0
DOCKER_IMAGE_TAG=0.2.1
DOCKER_IMAGE_NAME=ci-provisioned-ubuntu
DOCKER_USERNAME=${DOCKER_HUB_LOGIN}
DOCKER_PASSWORD=${DOCKER_HUB_PASSWORD}
Expand Down

0 comments on commit e7e26f6

Please sign in to comment.