Remove unused environment variables

dochang · Jun 2, 2020 · ba77ff6 · ba77ff6
1 parent 75aaa92
commit ba77ff6
Show file tree

Hide file tree

Showing 51 changed files with 25 additions and 201 deletions.
diff --git a/23.4/ubuntu/14.04/bootstrap/Dockerfile b/23.4/ubuntu/14.04/bootstrap/Dockerfile
@@ -25,9 +25,6 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-23.4"
-ENV EMACS_VERSION="23.4"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/23.4/ubuntu/14.04/bootstrap/dev/Dockerfile b/23.4/ubuntu/14.04/bootstrap/dev/Dockerfile
@@ -36,11 +36,7 @@ RUN cd /tmp && \
     make install && \
     rm -rf texinfo*
 
-ENV EMACS_BRANCH="emacs-23.4"
-ENV EMACS_VERSION="23.4"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-23.4 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./configure --build="$(dpkg-architecture | grep DEB_BUILD_GNU_TYPE | cut -d= -f2)" --with-crt-dir="/usr/lib/$(dpkg-architecture | grep DEB_BUILD_MULTIARCH | cut -d= -f2)" --with-x-toolkit="no" && \
     make bootstrap && \

diff --git a/24.1/ubuntu/14.04/Dockerfile b/24.1/ubuntu/14.04/Dockerfile
@@ -25,9 +25,6 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-24.1"
-ENV EMACS_VERSION="24.1"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/24.1/ubuntu/14.04/dev/Dockerfile b/24.1/ubuntu/14.04/dev/Dockerfile
@@ -28,11 +28,7 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-24.1"
-ENV EMACS_VERSION="24.1"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-24.1 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     curl -sSLOJ "https://raw.githubusercontent.com/Silex/docker-emacs/master/templates/patches/0001-Fix-warning-preventing-build-on-ubuntu-14.04.patch" && \
     git apply *.patch && \

diff --git a/24.2/ubuntu/14.04/Dockerfile b/24.2/ubuntu/14.04/Dockerfile
@@ -25,9 +25,6 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-24.2"
-ENV EMACS_VERSION="24.2"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/24.2/ubuntu/14.04/dev/Dockerfile b/24.2/ubuntu/14.04/dev/Dockerfile
@@ -28,11 +28,7 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-24.2"
-ENV EMACS_VERSION="24.2"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-24.2 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture | grep DEB_BUILD_GNU_TYPE | cut -d= -f2)" && \

diff --git a/24.3/ubuntu/14.04/Dockerfile b/24.3/ubuntu/14.04/Dockerfile
@@ -25,9 +25,6 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-24.3"
-ENV EMACS_VERSION="24.3"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/24.3/ubuntu/14.04/dev/Dockerfile b/24.3/ubuntu/14.04/dev/Dockerfile
@@ -28,11 +28,7 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-24.3"
-ENV EMACS_VERSION="24.3"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-24.3 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture | grep DEB_BUILD_GNU_TYPE | cut -d= -f2)" && \

diff --git a/24.4/ubuntu/14.04/Dockerfile b/24.4/ubuntu/14.04/Dockerfile
@@ -25,9 +25,6 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-24.4"
-ENV EMACS_VERSION="24.4"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/24.4/ubuntu/14.04/dev/Dockerfile b/24.4/ubuntu/14.04/dev/Dockerfile
@@ -28,11 +28,7 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-24.4"
-ENV EMACS_VERSION="24.4"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-24.4 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture | grep DEB_BUILD_GNU_TYPE | cut -d= -f2)" && \

diff --git a/24.5/ubuntu/18.04/Dockerfile b/24.5/ubuntu/18.04/Dockerfile
@@ -30,9 +30,6 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-24.5"
-ENV EMACS_VERSION="24.5"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/24.5/ubuntu/18.04/dev/Dockerfile b/24.5/ubuntu/18.04/dev/Dockerfile
@@ -41,11 +41,7 @@ RUN apt-get update && \
             zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-24.5"
-ENV EMACS_VERSION="24.5"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-24.5 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" CFLAGS="-no-pie" && \

diff --git a/25.1/ubuntu/18.04/Dockerfile b/25.1/ubuntu/18.04/Dockerfile
@@ -30,9 +30,6 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-25.1"
-ENV EMACS_VERSION="25.1"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/25.1/ubuntu/18.04/dev/Dockerfile b/25.1/ubuntu/18.04/dev/Dockerfile
@@ -41,11 +41,7 @@ RUN apt-get update && \
             zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-25.1"
-ENV EMACS_VERSION="25.1"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-25.1 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" CFLAGS="-no-pie" --with-modules && \

diff --git a/25.2/alpine/3.9/Dockerfile b/25.2/alpine/3.9/Dockerfile
@@ -19,9 +19,6 @@ RUN apk add --no-cache \
         openssh-client \
         tiff
 
-ENV EMACS_BRANCH="emacs-25.2"
-ENV EMACS_VERSION="25.2"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/25.2/alpine/3.9/dev/Dockerfile b/25.2/alpine/3.9/dev/Dockerfile
@@ -35,11 +35,7 @@ RUN apk add --no-cache \
         texinfo \
         tiff-dev
 
-ENV EMACS_BRANCH="emacs-25.2"
-ENV EMACS_VERSION="25.2"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-25.2 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     curl -sSLOJ "https://git.alpinelinux.org/aports/plain/community/emacs/gamedir.patch?h=3.7-stable" && \
     curl -sSLOJ "https://git.alpinelinux.org/aports/plain/community/emacs/musl.patch?h=3.7-stable" && \

diff --git a/25.2/ubuntu/18.04/Dockerfile b/25.2/ubuntu/18.04/Dockerfile
@@ -30,9 +30,6 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-25.2"
-ENV EMACS_VERSION="25.2"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/25.2/ubuntu/18.04/dev/Dockerfile b/25.2/ubuntu/18.04/dev/Dockerfile
@@ -41,11 +41,7 @@ RUN apt-get update && \
             zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-25.2"
-ENV EMACS_VERSION="25.2"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-25.2 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" --with-modules && \

diff --git a/25.3/alpine/3.9/Dockerfile b/25.3/alpine/3.9/Dockerfile
@@ -19,9 +19,6 @@ RUN apk add --no-cache \
         openssh-client \
         tiff
 
-ENV EMACS_BRANCH="emacs-25.3"
-ENV EMACS_VERSION="25.3"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/25.3/alpine/3.9/dev/Dockerfile b/25.3/alpine/3.9/dev/Dockerfile
@@ -35,11 +35,7 @@ RUN apk add --no-cache \
         texinfo \
         tiff-dev
 
-ENV EMACS_BRANCH="emacs-25.3"
-ENV EMACS_VERSION="25.3"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-25.3 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     curl -sSLOJ "https://git.alpinelinux.org/aports/plain/community/emacs/gamedir.patch?h=3.7-stable" && \
     curl -sSLOJ "https://git.alpinelinux.org/aports/plain/community/emacs/musl.patch?h=3.7-stable" && \

diff --git a/25.3/ubuntu/18.04/Dockerfile b/25.3/ubuntu/18.04/Dockerfile
@@ -30,9 +30,6 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-25.3"
-ENV EMACS_VERSION="25.3"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/25.3/ubuntu/18.04/dev/Dockerfile b/25.3/ubuntu/18.04/dev/Dockerfile
@@ -41,11 +41,7 @@ RUN apt-get update && \
             zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-25.3"
-ENV EMACS_VERSION="25.3"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-25.3 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" --with-modules && \

diff --git a/26.1/alpine/3.9/Dockerfile b/26.1/alpine/3.9/Dockerfile
@@ -19,9 +19,6 @@ RUN apk add --no-cache \
         openssh-client \
         tiff
 
-ENV EMACS_BRANCH="emacs-26.1"
-ENV EMACS_VERSION="26.1"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/26.1/alpine/3.9/dev/Dockerfile b/26.1/alpine/3.9/dev/Dockerfile
@@ -35,11 +35,7 @@ RUN apk add --no-cache \
         texinfo \
         tiff-dev
 
-ENV EMACS_BRANCH="emacs-26.1"
-ENV EMACS_VERSION="26.1"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-26.1 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" --with-modules && \

diff --git a/26.1/ubuntu/18.04/Dockerfile b/26.1/ubuntu/18.04/Dockerfile
@@ -30,9 +30,6 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-26.1"
-ENV EMACS_VERSION="26.1"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/26.1/ubuntu/18.04/dev/Dockerfile b/26.1/ubuntu/18.04/dev/Dockerfile
@@ -41,11 +41,7 @@ RUN apt-get update && \
             zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-26.1"
-ENV EMACS_VERSION="26.1"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-26.1 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" --with-modules && \

diff --git a/26.2/alpine/3.9/Dockerfile b/26.2/alpine/3.9/Dockerfile
@@ -19,9 +19,6 @@ RUN apk add --no-cache \
         openssh-client \
         tiff
 
-ENV EMACS_BRANCH="emacs-26.2"
-ENV EMACS_VERSION="26.2"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/26.2/alpine/3.9/dev/Dockerfile b/26.2/alpine/3.9/dev/Dockerfile
@@ -35,11 +35,7 @@ RUN apk add --no-cache \
         texinfo \
         tiff-dev
 
-ENV EMACS_BRANCH="emacs-26.2"
-ENV EMACS_VERSION="26.2"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-26.2 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" --with-modules && \

diff --git a/26.2/ubuntu/18.04/Dockerfile b/26.2/ubuntu/18.04/Dockerfile
@@ -30,9 +30,6 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-26.2"
-ENV EMACS_VERSION="26.2"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/26.2/ubuntu/18.04/dev/Dockerfile b/26.2/ubuntu/18.04/dev/Dockerfile
@@ -41,11 +41,7 @@ RUN apt-get update && \
             zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-26.2"
-ENV EMACS_VERSION="26.2"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-26.2 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" --with-modules && \

diff --git a/26.3/alpine/3.9/Dockerfile b/26.3/alpine/3.9/Dockerfile
@@ -19,9 +19,6 @@ RUN apk add --no-cache \
         openssh-client \
         tiff
 
-ENV EMACS_BRANCH="emacs-26.3"
-ENV EMACS_VERSION="26.3"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/26.3/alpine/3.9/dev/Dockerfile b/26.3/alpine/3.9/dev/Dockerfile
@@ -35,11 +35,7 @@ RUN apk add --no-cache \
         texinfo \
         tiff-dev
 
-ENV EMACS_BRANCH="emacs-26.3"
-ENV EMACS_VERSION="26.3"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-26.3 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" --with-modules && \

diff --git a/26.3/ubuntu/18.04/Dockerfile b/26.3/ubuntu/18.04/Dockerfile
@@ -30,9 +30,6 @@ RUN apt-get update && \
             texinfo \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-26.3"
-ENV EMACS_VERSION="26.3"
-
 COPY --from=0 /root/.emacs.d /root/.emacs.d
 COPY --from=0 /usr/local /usr/local
 

diff --git a/26.3/ubuntu/18.04/dev/Dockerfile b/26.3/ubuntu/18.04/dev/Dockerfile
@@ -41,11 +41,7 @@ RUN apt-get update && \
             zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-ENV EMACS_BRANCH="emacs-26.3"
-ENV EMACS_VERSION="26.3"
-ENV EMACS_REPOSITORY="https://git.sv.gnu.org/git/emacs.git"
-
-RUN git clone --depth 1 --branch $EMACS_BRANCH $EMACS_REPOSITORY /opt/emacs && \
+RUN git clone --depth 1 --branch emacs-26.3 git://git.sv.gnu.org/emacs.git /opt/emacs && \
     cd /opt/emacs && \
     ./autogen.sh && \
     ./configure --build="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" --with-modules && \