Compare commits

...

18 Commits

Author SHA1 Message Date
nicolas.dorier
5a48c420ab
deprecate 2021-03-14 13:27:23 +09:00
nicolas.dorier
3bbd2d43f8
fix 2019-09-03 18:33:08 +09:00
nicolas.dorier
286e21c799
Don't use git to download pynacl sources 2019-09-03 18:20:53 +09:00
nicolas.dorier
a9961c8cd4
Fix build 2019-09-03 17:15:13 +09:00
nicolas.dorier
c0c4bcd73a
Patch PyNacl to make build pass on arm 2019-09-03 17:05:38 +09:00
nicolas.dorier
03cb5e7830
Remove pip install -q 2019-08-31 14:38:53 +09:00
nicolas.dorier
eab9d4e2f8
remove duplicate pip upgrade 2019-08-31 14:38:08 +09:00
nicolas.dorier
5604d95b18
bump PYINSTALLER_VER 2019-08-31 14:36:50 +09:00
nicolas.dorier
4772fcaa23
fix 2019-08-31 14:33:03 +09:00
nicolas.dorier
a52e3a1dfc
Install pip upgrade first 2019-08-31 14:30:56 +09:00
nicolas.dorier
d9256fb909
upgrade pip before starting 2019-08-31 14:16:36 +09:00
nicolas.dorier
029de75883
Push am64 2019-07-06 21:31:56 +09:00
nicolas.dorier
9010733053
Fix arm64 2019-07-06 19:45:05 +09:00
nicolas.dorier
b7fef6f21c
Build amd64 image 2019-07-06 19:23:09 +09:00
nicolas.dorier
354a79e4cc fix cp 2018-11-27 13:02:07 +09:00
nicolas.dorier
8c35f42c8e no need of manifest creation 2018-11-27 12:58:03 +09:00
nicolas.dorier
041dbb47d6 add manifest 2018-11-27 12:50:13 +09:00
nicolas.dorier
caab222076 initial commit 2018-11-27 12:45:25 +09:00
7 changed files with 326 additions and 0 deletions

125
.circleci/config.yml Normal file
View File

@ -0,0 +1,125 @@
version: 2
jobs:
build:
machine:
docker_layer_caching: true
steps:
- checkout
# publish jobs require $DOCKERHUB_USER, $DOCKERHUB_PASS defined
arm32v7:
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-arm32v7"
DOCKERHUB_DOCKEFILE="linuxarm32v7.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-arm-static "$(dirname "$DOCKERHUB_DOCKEFILE")/qemu-arm-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
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"
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
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
filters:
branches:
ignore: /.*/
tags:
only: /v[0-9]+(\.[0-9]+)*/

18
.gitattributes vendored Normal file
View File

@ -0,0 +1,18 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto
# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.h text
# Declare files that will always have CRLF line endings on checkout.
*.sln text eol=crlf
# Declare files that will always have CRLF line endings on checkout.
*.sh text eol=lf
*.Dockerfile text eol=lf
# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary

14
PyNaCl-remove-check.patch Normal file
View File

@ -0,0 +1,14 @@
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
README.md Normal file
View File

@ -0,0 +1 @@
MOVED TO https://github.com/btcpayserver/dockerfile-deps/tree/master/docker-compose

48
linuxamd64.Dockerfile Normal file
View File

@ -0,0 +1,48 @@
# 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

60
linuxarm32v7.Dockerfile Normal file
View File

@ -0,0 +1,60 @@
# Dockerfile to build docker-compose for aarch64
FROM arm32v7/python:3.6.5-stretch as builder
# Add env
ENV LANG C.UTF-8
# Enable cross-build for aarch64
#EnableQEMU COPY qemu-arm-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 arm32v7/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

60
linuxarm64v8.Dockerfile Normal file
View File

@ -0,0 +1,60 @@
# 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