Revert to separate ENV commands

Seems previous KEY=VAL entries are not evaluated further down the ENV line, so
RELEASE_URL turned into https://dist.torproject.org/torbrowser// in the previous state..
This commit is contained in:
Henrik Jonsson 2017-01-26 07:50:55 +01:00
parent 8e1cd84972
commit 5e73ac81fb

View File

@ -4,14 +4,14 @@ FROM debian
MAINTAINER Henrik Jonsson <me@hkjn.me>
ENV TOR_VERSION=6.5a6-hardened \
# Taken from https://dist.torproject.org/torbrowser/$TOR_VERSION/sha256sums-unsigned-build.txt
SHA256_CHECKSUM=03e7107d803af2e8c964980f7cbdb4f18af33e1b07867d8d1084bcede5597189 \
LANG=C.UTF-8 \
RELEASE_FILE=tor-browser-linux64-${TOR_VERSION}_ALL.tar.xz \
RELEASE_KEY=0x4E2C6E8793298290 \
RELEASE_URL=https://dist.torproject.org/torbrowser/${TOR_VERSION}/${RELEASE_FILE} \
PATH=$PATH:/usr/local/bin/Browser
ENV TOR_VERSION=6.5a6-hardened
# Via https://dist.torproject.org/torbrowser/$TOR_VERSION/sha256sums-unsigned-build.txt
ENV SHA256_CHECKSUM=03e7107d803af2e8c964980f7cbdb4f18af33e1b07867d8d1084bcede5597189
ENV LANG=C.UTF-8
ENV RELEASE_FILE=tor-browser-linux64-${TOR_VERSION}_ALL.tar.xz
ENV RELEASE_KEY=0x4E2C6E8793298290
ENV RELEASE_URL=https://dist.torproject.org/torbrowser/${TOR_VERSION}/${RELEASE_FILE}
ENV PATH=$PATH:/usr/local/bin/Browser
RUN apt-get update && \
apt-get install -y \