Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jenkins dockerfiles improvements #2398

Merged
merged 5 commits into from
Oct 27, 2023
Merged

Jenkins dockerfiles improvements #2398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
333d242
Update Dockerfile
paulineribeyre Oct 25, 2023
7c45e64
fix: java installation (#2394)
m0nhawk Oct 26, 2023
0070ab8
fix: adding setuptools (#2395)
m0nhawk Oct 26, 2023
361dc72
try installing npm
paulineribeyre Oct 26, 2023
e557917
other improvements
paulineribeyre Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/image_build_push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Build Python Base Images and Push to Quay and ECR
name: Build Python Base Images

on: push

jobs:
python_3-9:
name: Python 3.9 Build and Push
name: Python 3.9
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
with:
DOCKERFILE_LOCATION: "./Docker/python-nginx/python3.9-buster/Dockerfile"
Expand All @@ -17,7 +17,7 @@ jobs:
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
python_3-10:
name: Python 3.10 Build and Push
name: Python 3.10
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
with:
DOCKERFILE_LOCATION: "./Docker/python-nginx/python3.10-buster/Dockerfile"
Expand All @@ -30,7 +30,7 @@ jobs:
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
awshelper:
name: AwsHelper Build and Push
name: AwsHelper
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
with:
DOCKERFILE_LOCATION: "./Docker/awshelper/Dockerfile"
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/image_build_push_jenkins.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: Build Jenkins images and push to Quay
name: Build Jenkins images

on:
push:
paths:
- .github/workflows/image_build_push_jenkins.yaml
- Docker/jenkins/**

jobs:
jenkins:
name: Jenkins Build and Push
name: Jenkins
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
with:
DOCKERFILE_LOCATION: "./Docker/jenkins/Jenkins/Dockerfile"
Expand All @@ -21,7 +22,7 @@ jobs:
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
jenkins2:
name: Jenkins2 Build and Push
name: Jenkins2
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
with:
DOCKERFILE_LOCATION: "./Docker/jenkins/Jenkins2/Dockerfile"
Expand All @@ -35,7 +36,7 @@ jobs:
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
jenkins-ci-worker:
name: Jenkins-CI-Worker Build and Push
name: Jenkins-CI-Worker
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
with:
DOCKERFILE_LOCATION: "./Docker/jenkins/Jenkins-CI-Worker/Dockerfile"
Expand All @@ -49,7 +50,7 @@ jobs:
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
jenkins-qa-worker:
name: Jenkins-QA-Worker Build and Push
name: Jenkins-QA-Worker
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
with:
DOCKERFILE_LOCATION: "./Docker/jenkins/Jenkins-Worker/Dockerfile"
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/image_build_push_squid.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: Build Squid images and push to Quay
name: Build Squid images

on:
push:
paths:
- .github/workflows/image_build_push_squid.yaml
- Docker/squid/**

jobs:
squid:
name: Squid Build and Push
name: Squid image
uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
with:
DOCKERFILE_LOCATION: "./Docker/squid/Dockerfile"
Expand Down
4 changes: 2 additions & 2 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "^.secrets.baseline$",
"lines": null
},
"generated_at": "2023-09-18T18:49:22Z",
"generated_at": "2023-10-26T21:32:44Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -79,7 +79,7 @@
"hashed_secret": "10daf3a26c6a17242a5ab2438a12ebc8276c7603",
"is_secret": false,
"is_verified": false,
"line_number": 122,
"line_number": 121,
"type": "Secret Keyword"
}
],
Expand Down
7 changes: 3 additions & 4 deletions Docker/jenkins/Jenkins-CI-Worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@ RUN set -xe && apt-get update \
zlib1g-dev \
zsh \
ca-certificates-java \
openjdk-11-jre-headless \
&& ln -s /usr/bin/lua5.3 /usr/local/bin/lua

# Use jdk11
ENV JAVA_HOME="/usr/lib/jvm/java-11-openjdk-amd64"
ENV JAVA_HOME="/opt/java/openjdk"
ENV PATH="$JAVA_HOME/bin:$PATH"

COPY ./certfix.sh /certfix.sh
Expand Down Expand Up @@ -75,7 +74,7 @@ RUN sudo install -m 0755 -d /etc/apt/keyrings \

# install nodejs
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
RUN apt-get update && apt-get install -y nodejs
RUN apt-get update && apt-get install -y nodejs npm

# Install postgres 13 client
RUN curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc| gpg --dearmor -o /etc/apt/trusted.gpg.d/postgresql.gpg && \
Expand All @@ -98,7 +97,7 @@ RUN sed -i 's/python3/python3.8/' /usr/bin/lsb_release && \
sed -i 's/python3/python3.8/' /usr/bin/add-apt-repository

# install aws cli, poetry, pytest, etc.
RUN set -xe && python3.8 -m pip install --upgrade pip && python3.8 -m pip install awscli --upgrade && python3.8 -m pip install pytest --upgrade && python3.8 -m pip install poetry && python3.8 -m pip install PyYAML --upgrade && python3.8 -m pip install lxml --upgrade && python3.8 -m pip install yq --upgrade && python3.8 -m pip install datadog --upgrade
RUN set -xe && python3.8 -m pip install --upgrade pip setuptools && python3.8 -m pip install awscli --upgrade && python3.8 -m pip install pytest --upgrade && python3.8 -m pip install poetry && python3.8 -m pip install PyYAML --upgrade && python3.8 -m pip install lxml --upgrade && python3.8 -m pip install yq --upgrade && python3.8 -m pip install datadog --upgrade

# install terraform
RUN curl -o /tmp/terraform.zip https://releases.hashicorp.com/terraform/0.11.15/terraform_0.11.15_linux_amd64.zip \
Expand Down
6 changes: 1 addition & 5 deletions Docker/jenkins/Jenkins-Worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ RUN set -xe && apt-get update && apt-get install -y apt-utils dnsutils build-ess

RUN apt-get update \
&& apt-get install -y lsb-release \
git \
apt-transport-https \
r-base \
libffi-dev \
Expand Down Expand Up @@ -36,11 +37,6 @@ RUN apt-get update \
# install Ruby.
RUN apt-get install -y ruby-full

# install GIT from buster-backports
RUN echo "deb http://deb.debian.org/debian buster-backports main" > /etc/apt/sources.list.d/buster-backports.list \
&& apt-get update \
&& apt-get -t=buster-backports -y install git=1:2.30.*

#
# install docker tools:
#
Expand Down
2 changes: 1 addition & 1 deletion kube/services/jobs/usersync-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ spec:
exit 1
fi
#-----------------
echo "awshelper downloading ${userYamlS3Path} to /mnt/shared/useryaml";
echo "awshelper downloading ${userYamlS3Path} to /mnt/shared/user.yaml";
n=0
until [ $n -ge 5 ]; do
echo "Download attempt $n"
Expand Down
Loading