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

fix: minor updates to docker image #80

Merged
merged 1 commit into from
Mar 25, 2024
+7 −11
Merged

fix: minor updates to docker image #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 5 additions & 10 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
&& rm -rf /var/lib/apt/lists/

# Add various java versions via apt-get
RUN curl -fsSL https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - \
&& add-apt-repository \
"deb [arch=amd64] https://packages.adoptium.net/artifactory/deb \
$(lsb_release -cs) \
main"
RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor | tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null \
&& echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list

RUN apt-get update && apt-get install --no-install-recommends -y \
temurin-11-jdk temurin-17-jdk\
Expand Down Expand Up @@ -150,11 +147,9 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
&& rm -rf /var/lib/apt/lists/

# Add various java versions via apt-get
RUN curl -fsSL https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - \
&& add-apt-repository \
"deb [arch=amd64] https://packages.adoptium.net/artifactory/deb \
$(lsb_release -cs) \
main"
RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | gpg --dearmor | tee /etc/apt/trusted.gpg.d/adoptium.gpg > /dev/null \
&& echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list


# Fix for slim docker images not including the man directories
RUN mkdir -p /usr/share/man/man1
Expand Down
3 changes: 2 additions & 1 deletion scripts/user_env/0_jenv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ git clone --depth 1 https://github.com/jenv/jenv.git "${JENV_ROOT}"

# pyenv install
eval "$(jenv init -)"

jenv add /usr/lib/jvm/temurin-11-jdk-amd64/
jenv add /usr/lib/jvm/temurin-17-jdk-amd64/

jenv doctor
jenv global system
jenv enable-plugin maven
Loading