Compare commits
No commits in common. "master" and "v1.22.0" have entirely different histories.
@ -7,7 +7,7 @@ jobs:
|
||||
- checkout
|
||||
|
||||
# publish jobs require $DOCKERHUB_USER, $DOCKERHUB_PASS defined
|
||||
arm32v7:
|
||||
publish_linuxarm32v7:
|
||||
machine:
|
||||
docker_layer_caching: true
|
||||
steps:
|
||||
@ -30,94 +30,15 @@ jobs:
|
||||
sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
|
||||
sudo docker build --pull --build-arg "DOCKER_COMPOSE_VER=$LATEST_TAG" -t $DOCKERHUB_DESTINATION -f "$DOCKERHUB_DOCKEFILE" .
|
||||
sudo docker push $DOCKERHUB_DESTINATION
|
||||
arm64v8:
|
||||
machine:
|
||||
image: ubuntu-1604:201903-01
|
||||
docker_layer_caching: true
|
||||
steps:
|
||||
- checkout
|
||||
- run:
|
||||
command: |
|
||||
LATEST_TAG="${CIRCLE_TAG:1}"
|
||||
DOCKERHUB_REPO="btcpayserver/docker-compose-builder"
|
||||
DOCKERHUB_DESTINATION="$DOCKERHUB_REPO:$LATEST_TAG-arm64v8"
|
||||
DOCKERHUB_DOCKEFILE="linuxarm64v8.Dockerfile"
|
||||
#
|
||||
# Make sure the builder is copy the arm emulator
|
||||
sudo docker run --rm --privileged multiarch/qemu-user-static:register --reset
|
||||
sudo apt update
|
||||
sudo apt install -y qemu qemu-user-static qemu-user binfmt-support
|
||||
sudo cp /usr/bin/qemu-aarch64-static "$(dirname "$DOCKERHUB_DOCKEFILE")/qemu-aarch64-static"
|
||||
sed -i -e 's/#EnableQEMU //g' "$DOCKERHUB_DOCKEFILE"
|
||||
#
|
||||
echo "Pushing $DOCKERHUB_DOCKEFILE to dockerhub repository $DOCKERHUB_DESTINATION"
|
||||
sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
|
||||
sudo docker build --pull --build-arg "DOCKER_COMPOSE_VER=$LATEST_TAG" -t $DOCKERHUB_DESTINATION -f "$DOCKERHUB_DOCKEFILE" .
|
||||
sudo docker push $DOCKERHUB_DESTINATION
|
||||
amd64:
|
||||
machine:
|
||||
docker_layer_caching: true
|
||||
steps:
|
||||
- checkout
|
||||
- run:
|
||||
command: |
|
||||
LATEST_TAG="${CIRCLE_TAG:1}"
|
||||
DOCKERHUB_REPO="btcpayserver/docker-compose-builder"
|
||||
DOCKERHUB_DESTINATION="$DOCKERHUB_REPO:$LATEST_TAG-amd64"
|
||||
DOCKERHUB_DOCKEFILE="linuxamd64.Dockerfile"
|
||||
#
|
||||
echo "Pushing $DOCKERHUB_DOCKEFILE to dockerhub repository $DOCKERHUB_DESTINATION"
|
||||
sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
|
||||
sudo docker build --pull --build-arg "DOCKER_COMPOSE_VER=$LATEST_TAG" -t $DOCKERHUB_DESTINATION -f "$DOCKERHUB_DOCKEFILE" .
|
||||
sudo docker push $DOCKERHUB_DESTINATION
|
||||
multiarch:
|
||||
machine:
|
||||
image: ubuntu-1604:201903-01
|
||||
docker_layer_caching: true
|
||||
steps:
|
||||
- run:
|
||||
command: |
|
||||
# Turn on Experimental features
|
||||
sudo mkdir $HOME/.docker
|
||||
sudo sh -c 'echo "{ \"experimental\": \"enabled\" }" >> $HOME/.docker/config.json'
|
||||
#
|
||||
sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
|
||||
#
|
||||
LATEST_TAG=${CIRCLE_TAG:1} #trim v from tag
|
||||
DOCKERHUB_REPO="btcpayserver/docker-compose-builder"
|
||||
# Push a manifest like image, we support only arm32 now, so no need to create real manifest
|
||||
DOCKERHUB_DESTINATION="$DOCKERHUB_REPO:$LATEST_TAG"
|
||||
sudo docker manifest create --amend $DOCKERHUB_DESTINATION $DOCKERHUB_DESTINATION-amd64 $DOCKERHUB_DESTINATION-arm32v7 $DOCKERHUB_DESTINATION-arm64v8
|
||||
sudo docker manifest annotate $DOCKERHUB_DESTINATION $DOCKERHUB_DESTINATION-amd64 --os linux --arch amd64
|
||||
sudo docker manifest annotate $DOCKERHUB_DESTINATION $DOCKERHUB_DESTINATION-arm32v7 --os linux --arch arm --variant v7
|
||||
sudo docker manifest annotate $DOCKERHUB_DESTINATION $DOCKERHUB_DESTINATION-arm64v8 --os linux --arch arm64 --variant v8
|
||||
sudo docker manifest push $DOCKERHUB_DESTINATION -p
|
||||
sudo docker tag "$DOCKERHUB_DESTINATION-arm32v7" "$DOCKERHUB_DESTINATION"
|
||||
sudo docker push "$DOCKERHUB_DESTINATION"
|
||||
workflows:
|
||||
version: 2
|
||||
publish:
|
||||
jobs:
|
||||
- arm32v7:
|
||||
filters:
|
||||
branches:
|
||||
ignore: /.*/
|
||||
tags:
|
||||
only: /v[0-9]+(\.[0-9]+)*/
|
||||
- arm64v8:
|
||||
filters:
|
||||
branches:
|
||||
ignore: /.*/
|
||||
tags:
|
||||
only: /v[0-9]+(\.[0-9]+)*/
|
||||
- amd64:
|
||||
filters:
|
||||
branches:
|
||||
ignore: /.*/
|
||||
tags:
|
||||
only: /v[0-9]+(\.[0-9]+)*/
|
||||
- multiarch:
|
||||
requires:
|
||||
- amd64
|
||||
- arm32v7
|
||||
- arm64v8
|
||||
- publish_linuxarm32v7:
|
||||
filters:
|
||||
branches:
|
||||
ignore: /.*/
|
||||
|
||||
@ -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
|
||||
@ -1,48 +0,0 @@
|
||||
# Dockerfile to build docker-compose for aarch64
|
||||
FROM python:3.6.5-stretch as builder
|
||||
# Add env
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
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)
|
||||
# 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 SIX_VER 1.11.0
|
||||
|
||||
# Install dependencies
|
||||
RUN pip install --upgrade pip
|
||||
RUN pip install six==$SIX_VER
|
||||
|
||||
# Compile the pyinstaller "bootloader"
|
||||
# https://pyinstaller.readthedocs.io/en/stable/bootloader-building.html
|
||||
WORKDIR /build/pyinstallerbootloader
|
||||
RUN curl -fsSL https://github.com/pyinstaller/pyinstaller/releases/download/v$PYINSTALLER_VER/PyInstaller-$PYINSTALLER_VER.tar.gz | tar xvz >/dev/null \
|
||||
&& cd PyInstaller*/bootloader \
|
||||
&& python3 ./waf all
|
||||
|
||||
# Clone docker-compose
|
||||
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 cd compose-$DOCKER_COMPOSE_VER && mkdir ./dist \
|
||||
&& pip install -r requirements.txt -r requirements-build.txt
|
||||
|
||||
RUN cd compose-$DOCKER_COMPOSE_VER \
|
||||
&& echo "unknown" > compose/GITSHA \
|
||||
&& pyinstaller docker-compose.spec \
|
||||
&& mkdir /dist \
|
||||
&& mv dist/docker-compose /dist/docker-compose
|
||||
|
||||
FROM debian:stretch-slim
|
||||
|
||||
COPY --from=builder /dist/docker-compose /tmp/docker-compose
|
||||
|
||||
# Copy out the generated binary
|
||||
VOLUME /dist
|
||||
CMD /bin/cp /tmp/docker-compose /dist/docker-compose
|
||||
@ -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 \
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
# Dockerfile to build docker-compose for aarch64
|
||||
FROM arm64v8/python:3.6.5-stretch as builder
|
||||
# Add env
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
# Enable cross-build for aarch64
|
||||
#EnableQEMU COPY qemu-aarch64-static /usr/bin
|
||||
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)
|
||||
# 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 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"
|
||||
# https://pyinstaller.readthedocs.io/en/stable/bootloader-building.html
|
||||
WORKDIR /build/pyinstallerbootloader
|
||||
RUN curl -fsSL https://github.com/pyinstaller/pyinstaller/releases/download/v$PYINSTALLER_VER/PyInstaller-$PYINSTALLER_VER.tar.gz | tar xvz >/dev/null \
|
||||
&& cd PyInstaller*/bootloader \
|
||||
&& python3 ./waf all
|
||||
|
||||
# Clone docker-compose
|
||||
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 cd compose-$DOCKER_COMPOSE_VER \
|
||||
&& echo "unknown" > compose/GITSHA \
|
||||
&& pyinstaller docker-compose.spec \
|
||||
&& mkdir /dist \
|
||||
&& mv dist/docker-compose /dist/docker-compose
|
||||
|
||||
FROM arm64v8/debian:stretch-slim
|
||||
|
||||
COPY --from=builder /dist/docker-compose /tmp/docker-compose
|
||||
|
||||
# Copy out the generated binary
|
||||
VOLUME /dist
|
||||
CMD /bin/cp /tmp/docker-compose /dist/docker-compose
|
||||
Loading…
Reference in New Issue
Block a user