From 3d0b7bc9b114ff26790b626b17feb7e3f133a130 Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 8 Jan 2023 11:19:28 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 66 +++++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 40 deletions(-) diff --git a/Dockerfile b/Dockerfile index 54fbb11..9e778c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,47 +1,35 @@ -FROM casjaysdevdocker/debian:latest AS build +FROM casjaysdevdocker/alpine:latest AS build -ARG DEBIAN_VERSION="bullseye" +ARG ALPINE_VERSION="v3.16" ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data" \ DEFAULT_CONF_DIR="/usr/local/share/template-files/config" \ DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults" -ARG PACK_LIST="xorg x11-apps xz-utils" +ARG PACK_LIST="bash" -ENV LANG=en_US.utf8 \ +ENV LANG=en_US.UTF-8 \ ENV=ENV=~/.bashrc \ TZ="America/New_York" \ SHELL="/bin/sh" \ TERM="xterm-256color" \ TIMEZONE="${TZ:-$TIMEZONE}" \ - HOSTNAME="casjaysdev-code" \ - DEBIAN_FRONTEND="noninteractive" + HOSTNAME="casjaysdev-code" COPY ./rootfs/. / -RUN set -ex; rm -Rf "/etc/apt/sources.list" ; mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}" "/etc/sudoers.d" "/tmp/tor-profile"; \ - echo 'export DEBIAN_FRONTEND="noninteractive"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh" && \ - echo "deb http://deb.debian.org/debian ${DEBIAN_VERSION} main contrib non-free" >>"/etc/apt/sources.list" ; \ - echo "deb http://deb.debian.org/debian ${DEBIAN_VERSION}-updates main contrib non-free" >>"/etc/apt/sources.list" ; \ - echo "deb http://deb.debian.org/debian-security/ ${DEBIAN_VERSION}-security main contrib non-free" >>"/etc/apt/sources.list" ; \ - apt-get update -yy && apt-get upgrade -yy && apt-get install -yy ${PACK_LIST} && \ - useradd --shell /bin/bash --create-home --home-dir /home/x11user x11user && \ - usermod -a -G audio,video,sudo,tty,dialout,cdrom,floppy,audio,dip,video,plugdev x11user && \ - echo "x11user ALL=(ALL) NOPASSWD: ALL" >"/etc/sudoers.d/x11user" && \ - wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >/tmp/packages.microsoft.gpg && \ - install -D -o root -g root -m 644 /tmp/packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg && \ - echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" >"/etc/apt/sources.list.d/vscode.list" && \ - apt-get update -yy && apt-get upgrade -yy && apt-get install -yy code -yy - -RUN sudo -u x11user setup-code.sh && \ - chown -Rf x11user:x11user "/home/x11user" +RUN set -ex; \ + rm -Rf "/etc/apk/repositories"; \ + mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}"; \ + echo "http://dl-cdn.alpinelinux.org/alpine/${ALPINE_VERSION}/main" >>"/etc/apk/repositories"; \ + echo "http://dl-cdn.alpinelinux.org/alpine/${ALPINE_VERSION}/community" >>"/etc/apk/repositories"; \ + if [ "${ALPINE_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${ALPINE_VERSION}/testing" >>"/etc/apk/repositories" ; fi ; \ + apk update --update-cache && apk add --no-cache ${PACK_LIST} && \ + echo RUN echo 'Running cleanup' ; \ - update-alternatives --install /bin/sh sh /bin/bash 1 ; \ - apt-get clean ; \ - rm -Rf /usr/share/doc/* /usr/share/info/* ; \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* ; \ - rm -Rf /usr/local/bin/.gitkeep /config /data /var/lib/apt/lists/* ; \ + rm -Rf /usr/share/doc/* /usr/share/info/* /tmp/* /var/tmp/* ; \ + rm -Rf /usr/local/bin/.gitkeep /usr/local/bin/.gitkeep /config /data /var/cache/apk/* ; \ rm -rf /lib/systemd/system/multi-user.target.wants/* ; \ rm -rf /etc/systemd/system/*.wants/* ; \ rm -rf /lib/systemd/system/local-fs.target.wants/* ; \ @@ -54,15 +42,15 @@ RUN echo 'Running cleanup' ; \ FROM scratch ARG \ - SERVICE_PORT="" \ - EXPOSE_PORTS="1-65535" \ + SERVICE_PORT="80" \ + EXPOSE_PORTS="80" \ PHP_SERVER="code" \ NODE_VERSION="system" \ NODE_MANAGER="system" \ BUILD_VERSION="latest" \ LICENSE="MIT" \ IMAGE_NAME="code" \ - BUILD_DATE="Thu Oct 20 05:32:58 PM EDT 2022" \ + BUILD_DATE="Sun Nov 13 12:16:02 PM EST 2022" \ TIMEZONE="America/New_York" LABEL maintainer="CasjaysDev " \ @@ -80,32 +68,30 @@ LABEL maintainer="CasjaysDev " \ org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/${IMAGE_NAME}" \ org.opencontainers.image.url.source="https://github.com/casjaysdevdocker/${IMAGE_NAME}" \ org.opencontainers.image.documentation="https://hub.docker.com/r/casjaysdevdocker/${IMAGE_NAME}" \ - org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}" + org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}" \ + com.github.containers.toolbox="false" -ENV LANG=en_US.utf8 \ +ENV LANG=en_US.UTF-8 \ ENV=~/.bashrc \ SHELL="/bin/bash" \ PORT="${SERVICE_PORT}" \ TERM="xterm-256color" \ PHP_SERVER="${PHP_SERVER}" \ - NODE_VERSION="${NODE_VERSION}" \ - NODE_MANAGER="${NODE_MANAGER}" \ CONTAINER_NAME="${IMAGE_NAME}" \ TZ="${TZ:-America/New_York}" \ TIMEZONE="${TZ:-$TIMEZONE}" \ - HOSTNAME="casjaysdev-${IMAGE_NAME}" \ - USER="x11user" \ - HOME="/home/x11user" + HOSTNAME="casjaysdev-${IMAGE_NAME}" COPY --from=build /. / -USER x11user -WORKDIR /home/x11user +USER root +WORKDIR /root -VOLUME [ "/tmp/.X11-unix", "$HOME/.Xauthority", ] +VOLUME [ "/config","/data" ] EXPOSE $EXPOSE_PORTS #CMD [ "" ] ENTRYPOINT [ "tini", "-p", "SIGTERM", "--", "/usr/local/bin/entrypoint.sh" ] HEALTHCHECK --start-period=1m --interval=2m --timeout=3s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ] +