Compare commits
No commits in common. "master" and "1.24.1" have entirely different histories.
@ -1,14 +0,0 @@
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 747dc62..bad491d 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -175,9 +175,6 @@ class build_clib(_build_clib):
|
||||
# Build the library
|
||||
subprocess.check_call(["make"] + make_args, cwd=build_temp)
|
||||
|
||||
- # Check the build library
|
||||
- subprocess.check_call(["make", "check"] + make_args, cwd=build_temp)
|
||||
-
|
||||
# Install the built library
|
||||
subprocess.check_call(["make", "install"] + make_args, cwd=build_temp)
|
||||
|
||||
@ -1 +0,0 @@
|
||||
MOVED TO https://github.com/btcpayserver/dockerfile-deps/tree/master/docker-compose
|
||||
@ -7,14 +7,13 @@ RUN apt-get update && apt-get install -qq --no-install-recommends unzip
|
||||
|
||||
# Set the versions
|
||||
ARG DOCKER_COMPOSE_VER
|
||||
# docker-compose requires pyinstaller 3.5 (check github.com/docker/compose/requirements-build.txt)
|
||||
# docker-compose requires pyinstaller 3.3.1 (check github.com/docker/compose/requirements-build.txt)
|
||||
# If this changes, you may need to modify the version of "six" below
|
||||
ENV PYINSTALLER_VER 3.5
|
||||
# "six" is needed for PyInstaller. v1.11.0 is the latest as of PyInstaller 3.5
|
||||
ENV PYINSTALLER_VER 3.3.1
|
||||
# "six" is needed for PyInstaller. v1.11.0 is the latest as of PyInstaller 3.3.1
|
||||
ENV SIX_VER 1.11.0
|
||||
|
||||
# Install dependencies
|
||||
RUN pip install --upgrade pip
|
||||
RUN pip install six==$SIX_VER
|
||||
|
||||
# Compile the pyinstaller "bootloader"
|
||||
@ -29,9 +28,9 @@ WORKDIR /build/dockercompose
|
||||
RUN curl -fsSL https://github.com/docker/compose/archive/$DOCKER_COMPOSE_VER.zip > $DOCKER_COMPOSE_VER.zip \
|
||||
&& unzip $DOCKER_COMPOSE_VER.zip
|
||||
|
||||
# Run the build steps (taken from https://github.com/docker/compose/blob/master/script/build/linux-entrypoint)
|
||||
# Run the build steps (taken from github.com/docker/compose/script/build/linux-entrypoint)
|
||||
RUN cd compose-$DOCKER_COMPOSE_VER && mkdir ./dist \
|
||||
&& pip install -r requirements.txt -r requirements-build.txt
|
||||
&& pip install -q -r requirements.txt -r requirements-build.txt
|
||||
|
||||
RUN cd compose-$DOCKER_COMPOSE_VER \
|
||||
&& echo "unknown" > compose/GITSHA \
|
||||
|
||||
@ -9,15 +9,14 @@ RUN apt-get update && apt-get install -qq --no-install-recommends unzip
|
||||
|
||||
# Set the versions
|
||||
ARG DOCKER_COMPOSE_VER
|
||||
# docker-compose requires pyinstaller 3.5 (check github.com/docker/compose/requirements-build.txt)
|
||||
# docker-compose requires pyinstaller 3.3.1 (check github.com/docker/compose/requirements-build.txt)
|
||||
# If this changes, you may need to modify the version of "six" below
|
||||
ENV PYINSTALLER_VER 3.5
|
||||
# "six" is needed for PyInstaller. v1.11.0 is the latest as of PyInstaller 3.5
|
||||
ENV PYINSTALLER_VER 3.3.1
|
||||
# "six" is needed for PyInstaller. v1.11.0 is the latest as of PyInstaller 3.3.1
|
||||
ENV SIX_VER 1.11.0
|
||||
|
||||
# Install dependencies
|
||||
# RUN apt-get update && apt-get install -y
|
||||
RUN pip install --upgrade pip
|
||||
RUN pip install six==$SIX_VER
|
||||
|
||||
# Compile the pyinstaller "bootloader"
|
||||
@ -32,18 +31,9 @@ WORKDIR /build/dockercompose
|
||||
RUN curl -fsSL https://github.com/docker/compose/archive/$DOCKER_COMPOSE_VER.zip > $DOCKER_COMPOSE_VER.zip \
|
||||
&& unzip $DOCKER_COMPOSE_VER.zip
|
||||
|
||||
# We need to patch pynacl because of https://github.com/pyca/pynacl/issues/553
|
||||
COPY PyNaCl-remove-check.patch PyNaCl-remove-check.patch
|
||||
RUN cd compose-$DOCKER_COMPOSE_VER && pip download --dest "/tmp/packages" -r requirements.txt -r requirements-build.txt wheel && cd .. && \
|
||||
wget -qO pynacl.tar.gz https://github.com/pyca/pynacl/archive/1.3.0.tar.gz && \
|
||||
echo "205adb2804eed4bc3780584e368ef2e9b8b22a7aae85323068cadd59f3c8a584 pynacl.tar.gz" | sha256sum -c - && \
|
||||
mkdir pynacl && tar --strip-components=1 -xvf pynacl.tar.gz -C pynacl && rm pynacl.tar.gz && \
|
||||
cd pynacl && \
|
||||
git apply ../PyNaCl-remove-check.patch && \
|
||||
python3 setup.py sdist && \
|
||||
cp -f dist/PyNaCl-1.3.0.tar.gz /tmp/packages/ && \
|
||||
cd ../compose-$DOCKER_COMPOSE_VER && rm -rf ../pynacl && \
|
||||
pip install --no-index --find-links /tmp/packages -r requirements.txt -r requirements-build.txt && rm -rf /tmp/packages
|
||||
# Run the build steps (taken from github.com/docker/compose/script/build/linux-entrypoint)
|
||||
RUN cd compose-$DOCKER_COMPOSE_VER && mkdir ./dist \
|
||||
&& pip install -q -r requirements.txt -r requirements-build.txt
|
||||
|
||||
RUN cd compose-$DOCKER_COMPOSE_VER \
|
||||
&& echo "unknown" > compose/GITSHA \
|
||||
|
||||
@ -9,15 +9,14 @@ RUN apt-get update && apt-get install -qq --no-install-recommends unzip
|
||||
|
||||
# Set the versions
|
||||
ARG DOCKER_COMPOSE_VER
|
||||
# docker-compose requires pyinstaller 3.5 (check github.com/docker/compose/requirements-build.txt)
|
||||
# docker-compose requires pyinstaller 3.3.1 (check github.com/docker/compose/requirements-build.txt)
|
||||
# If this changes, you may need to modify the version of "six" below
|
||||
ENV PYINSTALLER_VER 3.5
|
||||
# "six" is needed for PyInstaller. v1.11.0 is the latest as of PyInstaller 3.5
|
||||
ENV PYINSTALLER_VER 3.3.1
|
||||
# "six" is needed for PyInstaller. v1.11.0 is the latest as of PyInstaller 3.3.1
|
||||
ENV SIX_VER 1.11.0
|
||||
|
||||
# Install dependencies
|
||||
# RUN apt-get update && apt-get install -y
|
||||
RUN pip install --upgrade pip
|
||||
RUN pip install six==$SIX_VER
|
||||
|
||||
# Compile the pyinstaller "bootloader"
|
||||
@ -32,18 +31,9 @@ WORKDIR /build/dockercompose
|
||||
RUN curl -fsSL https://github.com/docker/compose/archive/$DOCKER_COMPOSE_VER.zip > $DOCKER_COMPOSE_VER.zip \
|
||||
&& unzip $DOCKER_COMPOSE_VER.zip
|
||||
|
||||
# We need to patch pynacl because of https://github.com/pyca/pynacl/issues/553
|
||||
COPY PyNaCl-remove-check.patch PyNaCl-remove-check.patch
|
||||
RUN cd compose-$DOCKER_COMPOSE_VER && pip download --dest "/tmp/packages" -r requirements.txt -r requirements-build.txt wheel && cd .. && \
|
||||
wget -qO pynacl.tar.gz https://github.com/pyca/pynacl/archive/1.3.0.tar.gz && \
|
||||
echo "205adb2804eed4bc3780584e368ef2e9b8b22a7aae85323068cadd59f3c8a584 pynacl.tar.gz" | sha256sum -c - && \
|
||||
mkdir pynacl && tar --strip-components=1 -xvf pynacl.tar.gz -C pynacl && rm pynacl.tar.gz && \
|
||||
cd pynacl && \
|
||||
git apply ../PyNaCl-remove-check.patch && \
|
||||
python3 setup.py sdist && \
|
||||
cp -f dist/PyNaCl-1.3.0.tar.gz /tmp/packages/ && \
|
||||
cd ../compose-$DOCKER_COMPOSE_VER && rm -rf ../pynacl && \
|
||||
pip install --no-index --find-links /tmp/packages -r requirements.txt -r requirements-build.txt && rm -rf /tmp/packages
|
||||
# Run the build steps (taken from github.com/docker/compose/script/build/linux-entrypoint)
|
||||
RUN cd compose-$DOCKER_COMPOSE_VER && mkdir ./dist \
|
||||
&& pip install -q -r requirements.txt -r requirements-build.txt
|
||||
|
||||
RUN cd compose-$DOCKER_COMPOSE_VER \
|
||||
&& echo "unknown" > compose/GITSHA \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user