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.

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

SNOW-1833578 Add net9 docker image #1068

Merged
merged 4 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ timestamps {
string(name: 'branch', value: 'main'),
string(name: 'client_git_commit', value: scmInfo.GIT_COMMIT),
string(name: 'client_git_branch', value: scmInfo.GIT_BRANCH),
string(name: 'TARGET_DOCKER_TEST_IMAGE', value: 'dotnet-ubuntu204-net8'),
string(name: 'TARGET_DOCKER_TEST_IMAGE', value: 'dotnet-ubuntu204-net9'),
string(name: 'parent_job', value: env.JOB_NAME),
string(name: 'parent_build_number', value: env.BUILD_NUMBER)
]
Expand Down
4 changes: 2 additions & 2 deletions ci/_init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ BUILD_IMAGE_VERSION=1
TEST_IMAGE_VERSION=1

declare -A BUILD_IMAGE_NAMES=(
[$DRIVER_NAME-ubuntu204-net8]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-ubuntu204-net8-build:$BUILD_IMAGE_VERSION
sfc-gh-knozderko marked this conversation as resolved.
Show resolved Hide resolved
[$DRIVER_NAME-ubuntu204-net9]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-ubuntu204-net9-build:$BUILD_IMAGE_VERSION
)
export BUILD_IMAGE_NAMES

declare -A TEST_IMAGE_NAMES=(
[$DRIVER_NAME-ubuntu204-net8]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-ubuntu204-net8-test:$TEST_IMAGE_VERSION
[$DRIVER_NAME-ubuntu204-net9]=$DOCKER_REGISTRY_NAME/client-$DRIVER_NAME-ubuntu204-net9-test:$TEST_IMAGE_VERSION
)
export TEST_IMAGE_NAMES
2 changes: 1 addition & 1 deletion ci/image/Dockerfile.dotnet-ubuntu204-net8-build
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN apt-get install -y dotnet-sdk-8.0

# gosu
RUN wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.14/gosu-$(dpkg --print-architecture)" && \
chmod +x /usr/local/bin/gosu && \
chmod +x /usr/local/bin/gosu

# clean up
RUN apt-get clean
Expand Down
55 changes: 55 additions & 0 deletions ci/image/Dockerfile.dotnet-ubuntu204-net9-build
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Use the official Ubuntu base image from Docker Hub
FROM ubuntu:20.04

USER root
WORKDIR /

ENV DEBIAN_FRONTEND noninteractive

# create dir for workspace
RUN mkdir -p /home/user
RUN chmod 777 /home/user

# Update packages and install any desired dependencies
RUN apt-get update
RUN apt-get install -y
RUN apt-get install -y wget
RUN apt-get install -y apt-transport-https
RUN apt-get install -y build-essential
RUN apt-get install -y libpng-dev
RUN apt-get install -y libtiff-dev
RUN apt-get install -y libjpeg-dev
RUN apt-get install -y libx11-dev
RUN apt-get install -y libgl1-mesa-dev
RUN apt-get install -y libglu1-mesa-dev
RUN apt-get install -y gcc
RUN wget https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
RUN dpkg -i packages-microsoft-prod.deb

# install basic tools
RUN apt-get install -y git
RUN apt-get install -y zstd
RUN apt-get install -y jq

# Install .NET SDK 9.0
RUN apt-get update
RUN apt-get install -y dotnet-sdk-8.0
RUN apt-get install -y dotnet-sdk-9.0

# gosu
RUN wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/1.14/gosu-$(dpkg --print-architecture)" && \
chmod +x /usr/local/bin/gosu

# clean up
RUN apt-get clean
RUN rm -rf /var/lib/apt/lists/*

# workspace
RUN mkdir -p /home/user && \
chmod 777 /home/user
WORKDIR /home/user

# entry point
COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
RUN chmod +x /usr/local/bin/entrypoint.sh
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
1 change: 1 addition & 0 deletions ci/image/Dockerfile.dotnet-ubuntu204-net9-test
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM nexus.int.snowflakecomputing.com:8086/docker/client-dotnet-ubuntu204-net9-build:1
Loading