Bugfixes

raccourci · May 13, 2024 · 5737f24 · 5737f24
1 parent bbb2f32
commit 5737f24
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 6 deletions.
diff --git a/puppet/debian11-bullseye-arm64v8/Dockerfile b/puppet/debian11-bullseye-arm64v8/Dockerfile
@@ -0,0 +1,25 @@
+FROM arm64v8/debian:bullseye
+
+ENV DEBIAN_CODENAME="bullseye"
+ENV LOCALTIME=Europe/Paris
+ENV PATH=/opt/puppetlabs/server/bin:/opt/puppetlabs/puppet/bin:/opt/puppetlabs/bin:$PATH
+
+RUN cp /usr/share/zoneinfo/$LOCALTIME /etc/localtime
+RUN echo $LOCALTIME > /etc/timezone
+RUN apt-get update
+RUN apt-get install -y apt-utils dialog dirmngr git wget curl lsb-release apt-transport-https ca-certificates
+RUN wget https://apt.puppet.com/puppet-release-"$DEBIAN_CODENAME".deb
+RUN dpkg -i puppet-release-"$DEBIAN_CODENAME".deb
+RUN rm puppet-release-"$DEBIAN_CODENAME".deb
+RUN apt-get update
+RUN apt-get install -y puppet-agent
+RUN apt-get upgrade -y
+RUN apt-get autoremove -y
+RUN apt-get autoclean -y
+RUN rm -rf /var/lib/apt/lists/*
+RUN rm -f /etc/puppetlabs/code/modules/
+RUN ln -s /etc/puppet/modules /etc/puppetlabs/code/
+RUN gem install librarian-puppet
+RUN ln -s /usr/local/bin/librarian-puppet /opt/puppetlabs/puppet/bin/librarian-puppet
+
+ENTRYPOINT [ "/bin/bash" ]
diff --git a/puppet/debian11-bullseye-arm64v8/docker-compose.yml b/puppet/debian11-bullseye-arm64v8/docker-compose.yml
@@ -0,0 +1,8 @@
+version: '3'
+
+services:
+    docker_debug:
+        build:
+            context: ./
+        privileged: true
+        container_name: docker_debug
diff --git a/puppet/debian11-bullseye/Dockerfile b/puppet/debian11-bullseye/Dockerfile
@@ -8,17 +8,18 @@ RUN cp /usr/share/zoneinfo/$LOCALTIME /etc/localtime
 RUN echo $LOCALTIME > /etc/timezone
 RUN apt-get update
 RUN apt-get install -y apt-utils dialog dirmngr git wget curl lsb-release apt-transport-https ca-certificates
-RUN wget https://apt.puppet.com/puppet7-release-"$DEBIAN_CODENAME".deb
-RUN dpkg -i puppet7-release-"$DEBIAN_CODENAME".deb
-RUN rm puppet7-release-"$DEBIAN_CODENAME".deb
+RUN wget https://apt.puppet.com/puppet-release-"$DEBIAN_CODENAME".deb
+RUN dpkg -i puppet-release-"$DEBIAN_CODENAME".deb
+RUN rm puppet-release-"$DEBIAN_CODENAME".deb
 RUN apt-get update
 RUN apt-get install -y puppet-agent
 RUN apt-get upgrade -y
 RUN apt-get autoremove -y
 RUN apt-get autoclean -y
 RUN rm -rf /var/lib/apt/lists/*
-RUN rmdir /etc/puppetlabs/code/modules/
+RUN rm -f /etc/puppetlabs/code/modules/
 RUN ln -s /etc/puppet/modules /etc/puppetlabs/code/
 RUN gem install librarian-puppet
+RUN ln -s /usr/local/bin/librarian-puppet /opt/puppetlabs/puppet/bin/librarian-puppet
 
 ENTRYPOINT [ "/bin/bash" ]
diff --git a/puppet/debian12-bookworm-arm64v8/Dockerfile b/puppet/debian12-bookworm-arm64v8/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get upgrade -y
 RUN apt-get autoremove -y
 RUN apt-get autoclean -y
 RUN rm -rf /var/lib/apt/lists/*
-RUN rmdir /etc/puppetlabs/code/modules/
+RUN rm -f /etc/puppetlabs/code/modules/
 RUN ln -s /etc/puppet/modules /etc/puppetlabs/code/
 RUN gem install librarian-puppet
 RUN ln -s /usr/local/bin/librarian-puppet /opt/puppetlabs/puppet/bin/librarian-puppet

diff --git a/puppet/debian12-bookworm/Dockerfile b/puppet/debian12-bookworm/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get upgrade -y
 RUN apt-get autoremove -y
 RUN apt-get autoclean -y
 RUN rm -rf /var/lib/apt/lists/*
-RUN rmdir /etc/puppetlabs/code/modules/
+RUN rm -f /etc/puppetlabs/code/modules/
 RUN ln -s /etc/puppet/modules /etc/puppetlabs/code/
 RUN gem install librarian-puppet
 RUN ln -s /usr/local/bin/librarian-puppet /opt/puppetlabs/puppet/bin/librarian-puppet