From bb078840d7b907dfdb75c7741aa281d4cfe4189c Mon Sep 17 00:00:00 2001 From: CyberVitexus Date: Fri, 6 Sep 2024 18:41:33 +0200 Subject: [PATCH] Update ENV --- Makefile | 3 +-- debian:trixie/Dockerfile | 11 +++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index aa22895..4799a3c 100644 --- a/Makefile +++ b/Makefile @@ -63,8 +63,7 @@ buildx-jammy: buildx-kinetic: docker buildx build --push --platform linux/arm/v7,linux/amd64/v3,linux/arm64/v8 --tag vitexsoftware/ubuntu:kinetic ubuntu:kinetic -buildx: buildx-buster buildx-bullseye buildx-bookworm buildx-focal buildx-hirsute buildx-impish buildx-jammy buildx-kinetic - +buildx: buildx-bullseye buildx-bookworm buildx-focal buildx-hirsute buildx-impish buildx-jammy buildx-kinetic clean: docker system prune -a -f diff --git a/debian:trixie/Dockerfile b/debian:trixie/Dockerfile index eb793a1..89dfa4f 100644 --- a/debian:trixie/Dockerfile +++ b/debian:trixie/Dockerfile @@ -1,10 +1,10 @@ FROM debian:trixie -ENV DEBIAN_FRONTEND noninteractive -ENV LANG en_US.utf-8 -ENV LC_ALL en_US.utf-8 +ENV DEBIAN_FRONTEND=noninteractive +ENV LANG=en_US.utf-8 +ENV LC_ALL=en_US.utf-8 -RUN apt-get update ; apt-get install -y wget ; echo "deb [signed-by=/usr/share/keyrings/vitexsoftware.gpg] http://repo.vitexsoftware.com bookworm main backports" | tee /etc/apt/sources.list.d/vitexsoftware.list ; wget -O /usr/share/keyrings/vitexsoftware.gpg http://repo.vitexsoftware.com/keyring.gpg +RUN apt-get update ; apt-get install -y wget ; echo "deb [signed-by=/usr/share/keyrings/vitexsoftware.gpg] http://repo.vitexsoftware.com trixie main backports" | tee /etc/apt/sources.list.d/vitexsoftware.list ; wget -O /usr/share/keyrings/vitexsoftware.gpg http://repo.vitexsoftware.com/keyring.gpg RUN apt-get -y install locales ; echo "LC_ALL=en_US.UTF-8" >> /etc/environment ; echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen ; echo "LANG=en_US.UTF-8" > /etc/locale.conf ; locale-gen en_US.UTF-8 RUN apt-get update && apt-get install -y pbuilder sudo curl wget php composer lsb-release jq moreutils aptitude gdebi-core apt-utils debhelper po-debconf php-xml php-dom php-intl @@ -15,9 +15,8 @@ RUN \ sed -i /etc/sudoers -re 's/^#includedir.*/## **Removed the include directive** ##"/g' && \ echo "jenkins ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \ echo "Customized the sudoers file for passwordless access to the jenkins user!" && \ - echo "jenkins user:"; su - jenkins -c id + echo "jenkins user:"; su - jenkins -c id RUN sed -i -e '/sendmail_path/c\sendmail_path="cat - >> /tmp/mailfile"' /etc/php/*/*/php.ini ; touch /tmp/mailfile ; chmod uog+rw /tmp/mailfile RUN mkdir -p /var/lib/jenkins/workspace/ ; chown jenkins:jenkins /var/lib/jenkins/ -Rv -