diff --git a/.env.scripts.18.04 b/.env.scripts.18.04 index 60fb7ee..055eb41 100644 --- a/.env.scripts.18.04 +++ b/.env.scripts.18.04 @@ -26,7 +26,7 @@ ENV_REGISTRY_URL="https://hub.docker.com/r/casjaysdev/ubuntu" # Push image info ENV_IMAGE_PUSH="casjaysdev/ubuntu" ENV_IMAGE_TAG="18.04" -ENV_ADD_TAGS="disco" +ENV_ADD_TAGS="bionic" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Pull image info ENV_PULL_URL="ubuntu" diff --git a/Dockerfile.18.04 b/Dockerfile.18.04 index b4ba2de..9ff554c 100644 --- a/Dockerfile.18.04 +++ b/Dockerfile.18.04 @@ -22,8 +22,8 @@ ARG NODE_VERSION="system" ARG NODE_MANAGER="system" ARG IMAGE_REPO="casjaysdev/ubuntu" -ARG IMAGE_VERSION="19.04" -ARG CONTAINER_VERSION="disco" +ARG IMAGE_VERSION="18.04" +ARG CONTAINER_VERSION="bionic" ARG PULL_URL="ubuntu" ARG DISTRO_VERSION="${IMAGE_VERSION}" @@ -78,7 +78,7 @@ RUN set -e; \ echo "Setting up prerequisites"; \ echo "$LANG UTF-8" >"/etc/locale.gen"; \ echo 'export DEBIAN_FRONTEND="'${DEBIAN_FRONTEND}'"' >"/etc/profile.d/apt.sh" && chmod 755 "/etc/profile.d/apt.sh"; \ -sed -i 's|http://\([a-z0-9.-]*\)\.archive.ubuntu.com/ubuntu|http://old-releases.ubuntu.com/ubuntu|g' /etc/apt/sources.list; \ + sed -i 's|http://\([a-z0-9.-]*\)\.archive.ubuntu.com/ubuntu|http://old-releases.ubuntu.com/ubuntu|g' /etc/apt/sources.list; \ apt-get update;apt-get upgrade -yy;apt-get install -yy bash locales; \ dpkg-reconfigure --frontend=noninteractive locales;update-locale LANG=$LANG; \ update-alternatives --install /bin/sh sh /bin/bash 1 @@ -116,7 +116,7 @@ RUN echo "Initializing packages before copying files to image"; \ echo "" COPY ./rootfs/. / -COPY ./Dockerfile.19.04 /root/docker/Dockerfile +COPY ./Dockerfile.18.04 /root/docker/Dockerfile RUN echo "Updating system files "; \ $SHELL_OPTS; \