From f61ac09c8db42cd9efa7d0e0e5f4cf06715115bd Mon Sep 17 00:00:00 2001
From: "egon w. stemle" <egon.stemle@eurac.edu>
Date: Tue, 9 Feb 2021 00:47:55 +0100
Subject: [PATCH] Rm apt mirrors
---
dockerfiles/nginx/Dockerfile | 8 +++-----
dockerfiles/nginx/ubuntu-16.04.sources.list | 1 -
dockerfiles/nginx/ubuntu-archive-16.04.sources.list | 4 ----
dockerfiles/nginx/ubuntu-mirror-16.04.sources.list | 4 ----
4 files changed, 3 insertions(+), 14 deletions(-)
delete mode 120000 dockerfiles/nginx/ubuntu-16.04.sources.list
delete mode 100644 dockerfiles/nginx/ubuntu-archive-16.04.sources.list
delete mode 100644 dockerfiles/nginx/ubuntu-mirror-16.04.sources.list
diff --git a/dockerfiles/nginx/Dockerfile b/dockerfiles/nginx/Dockerfile
index 3b83250..83d9250 100644
--- a/dockerfiles/nginx/Dockerfile
+++ b/dockerfiles/nginx/Dockerfile
@@ -16,27 +16,25 @@ ENV TERM linux
# Set some sane defaults for apt inside docker
ENV DEBIAN_FRONTEND=noninteractive
COPY apt.local.conf /etc/apt/apt.conf.d/99local.conf
-# use fast(er) local mirrors
-COPY ubuntu-$UBUNTU_VERSION.sources.list /etc/apt/sources.list
RUN apt-get update && \
apt-get upgrade
# install cpanm and dependencies
RUN apt-get update \
-&& apt-get install make gcc wget cpanminus
+ && apt-get install make gcc wget cpanminus
RUN cpanm -n File::Spec::Functions
RUN cpanm Term::ReadLine
# install jdk, ant, psql, mvn, make, libxml, xsltproc, zip, wget
RUN apt-get update \
-&& apt-get install ant curl libxml2-utils maven openjdk-8-jdk unzip xsltproc yui-compressor
+ && apt-get install ant curl libxml2-utils maven openjdk-8-jdk unzip xsltproc yui-compressor
# install convenience apps for debug purposes (vim and jsbeautifier)
RUN apt-get update && apt-get install vim less python-pip
RUN pip install --upgrade "pip < 21.0"
RUN pip install jsbeautifier
-#COPY jsbeautifier___init__.py /usr/local/lib/python2.7/dist-packages/jsbeautifier/__init__.py
+COPY jsbeautifier___init__.py /usr/local/lib/python2.7/dist-packages/jsbeautifier/__init__.py
# set up a proper locale
RUN apt-get update && apt-get install locales
diff --git a/dockerfiles/nginx/ubuntu-16.04.sources.list b/dockerfiles/nginx/ubuntu-16.04.sources.list
deleted file mode 120000
index f4b6c50..0000000
--- a/dockerfiles/nginx/ubuntu-16.04.sources.list
+++ /dev/null
@@ -1 +0,0 @@
-ubuntu-archive-16.04.sources.list
\ No newline at end of file
diff --git a/dockerfiles/nginx/ubuntu-archive-16.04.sources.list b/dockerfiles/nginx/ubuntu-archive-16.04.sources.list
deleted file mode 100644
index 5aac458..0000000
--- a/dockerfiles/nginx/ubuntu-archive-16.04.sources.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# http://layer0.authentise.com/docker-4-useful-tips-you-may-not-know-about.html
-deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe
-deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe
-deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe
diff --git a/dockerfiles/nginx/ubuntu-mirror-16.04.sources.list b/dockerfiles/nginx/ubuntu-mirror-16.04.sources.list
deleted file mode 100644
index 0e7283d..0000000
--- a/dockerfiles/nginx/ubuntu-mirror-16.04.sources.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# http://layer0.authentise.com/docker-4-useful-tips-you-may-not-know-about.html
-deb mirror://mirrors.ubuntu.com/mirrors.txt xenial main restricted universe multiverse
-deb mirror://mirrors.ubuntu.com/mirrors.txt xenial-updates main restricted universe multiverse
-deb mirror://mirrors.ubuntu.com/mirrors.txt xenial-security main restricted universe multiverse
--
GitLab