Page MenuHomeDevCentral
Files F4793956

No OneTemporary
Actions

View Options

diff --git a/jenkins-agent-barebone/Dockerfile b/jenkins-agent-barebone/Dockerfile
index 4deb1b8..edf41d4 100644
--- a/jenkins-agent-barebone/Dockerfile
+++ b/jenkins-agent-barebone/Dockerfile
@@ -1,28 +1,28 @@
#
# Nasqueron - Jenkins agent Docker image, not customized
#
-FROM debian:stretch
+FROM debian:bullseye
MAINTAINER Sébastien Santoro aka Dereckson <dereckson+nasqueron-docker@espace-win.org>
#
# Prepare the container
#
RUN apt-get update && apt-get install -y \
- openjdk-8-jdk ant openssh-server openssh-client locales \
+ openjdk-17-jdk ant openssh-server openssh-client locales \
--no-install-recommends && rm -r /var/lib/apt/lists/* && \
mkdir -p /var/run/sshd && \
sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
echo 'LANG="en_US.UTF-8"' > /etc/default/locale && \
dpkg-reconfigure --frontend=noninteractive locales && \
update-locale LANG=en_US.UTF-8
#
# Docker properties
#
ENV LANG en_US.UTF-8
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
diff --git a/jenkins-agent-rust/Dockerfile b/jenkins-agent-rust/Dockerfile
index f5d95e2..65925bd 100644
--- a/jenkins-agent-rust/Dockerfile
+++ b/jenkins-agent-rust/Dockerfile
@@ -1,36 +1,36 @@
#
# Nasqueron - Jenkins agent Docker image for Rust applications
#
FROM nasqueron/jenkins-agent-barebone
MAINTAINER Sébastien Santoro aka Dereckson <dereckson+nasqueron-docker@espace-win.org>
#
# Prepare the container
#
# Rustup installation and libs to use Diesel from https://github.com/emk/rust-musl-builder
#
RUN apt-get update && \
apt-get install -y build-essential cmake git curl nano vim file \
- libpq-dev libsqlite-dev pkgconf sudo xutils-dev openssl \
+ libpq-dev libsqlite3-dev pkgconf sudo xutils-dev openssl \
strace gdb libssl-dev wget libpcre3-dev && \
apt-get autoremove && apt-get clean && \
groupadd -r app -g 433 && \
mkdir /home/app && \
useradd -u 431 -r -g app -d /home/app -s /bin/sh -c "Default application account" app && \
chown -R app:app /home/app && \
chmod 711 /home/app && \
mkdir /usr/local/cargo /usr/local/multirust && \
chown -R app:app /usr/local/cargo /usr/local/multirust
ENV TOOLCHAIN=nightly CARGO_HOME=/usr/local/cargo RUSTUP_HOME=/usr/local/multirust
USER app
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN && \
/usr/local/cargo/bin/rustup install $TOOLCHAIN && \
/usr/local/cargo/bin/rustup default $TOOLCHAIN && \
/usr/local/cargo/bin/rustup component add clippy-preview --toolchain=$TOOLCHAIN && \
/usr/local/cargo/bin/rustup component add rustfmt-preview --toolchain=$TOOLCHAIN
USER root

File Metadata

Mime Type
text/x-diff
Expires
Fri, Feb 28, 22:48 (23 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2448015
Default Alt Text
(2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator