alemaire/buildx
1
0
Fork 0
mirror of https://gitlab.com/alemaire/buildx.git synced 2025-01-10 18:43:29 +00:00
Code Issues Projects Releases Wiki Activity

Update synapse/Dockerfile, synapse/Makefile files

Browse Source
This commit is contained in:
Adrien le Maire 2021-04-30 11:31:26 +00:00
parent 4071758696
commit 3a3fdc6e55
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
synapse/Dockerfile
View File

@ -5,16 +5,12 @@
# #
# docker build -f docker/Dockerfile . # docker build -f docker/Dockerfile .
# #
# There is an optional PYTHON_VERSION build argument which sets the
# version of python to build against: for example:
# #
# docker build -f docker/Dockerfile --build-arg PYTHON_VERSION=3.6 . ARG DEBIAN_VERSION=20210408
#
### ###
### Stage 0: builder ### Stage 0: builder
### ###
FROM docker.io/debian:bullseye-slim as builder FROM docker.io/debian:bullseye-${DEBIAN_VERSION}-slim as builder
# install the OS build deps # install the OS build deps
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
@ -27,6 +23,8 @@ RUN apt-get update && apt-get install -y \
libxml++2.6-dev \ libxml++2.6-dev \
libxslt1-dev \ libxslt1-dev \
openssl \ openssl \
python3-dev \
cargo \
rustc \ rustc \
zlib1g-dev \ zlib1g-dev \
python3-pip \ python3-pip \
@ -74,7 +72,8 @@ COPY synapse/python_dependencies.py /synapse/synapse/python_dependencies.py
# used while you develop on the source # used while you develop on the source
# #
# This is aiming at installing the `install_requires` and `extras_require` from `setup.py` # This is aiming at installing the `install_requires` and `extras_require` from `setup.py`
RUN pip install --prefix="/install" --no-warn-script-location \ RUN pip install --upgrade pip && \
pip install --prefix="/install" --no-warn-script-location \
/synapse[all] /synapse[all]
# Copy over the rest of the project # Copy over the rest of the project
@ -89,14 +88,14 @@ RUN pip3 install --prefix="/install" --no-deps --no-warn-script-location /synaps
### Stage 1: runtime ### Stage 1: runtime
### ###
FROM docker.io/debian:bullseye-slim FROM docker.io/debian:bullseye-${DEBIAN_VERSION}-slim
LABEL org.opencontainers.image.url='https://matrix.org/docs/projects/server/synapse' LABEL org.opencontainers.image.url='https://matrix.org/docs/projects/server/synapse'
LABEL org.opencontainers.image.documentation='https://github.com/matrix-org/synapse/blob/master/docker/README.md' LABEL org.opencontainers.image.documentation='https://github.com/matrix-org/synapse/blob/master/docker/README.md'
LABEL org.opencontainers.image.source='https://github.com/matrix-org/synapse.git' LABEL org.opencontainers.image.source='https://github.com/matrix-org/synapse.git'
LABEL org.opencontainers.image.licenses='Apache-2.0' LABEL org.opencontainers.image.licenses='Apache-2.0'
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y --no-install-recommends \
curl \ curl \
gosu \ gosu \
libjpeg62-turbo \ libjpeg62-turbo \

11
synapse/Makefile
View File

@ -1,11 +1,11 @@
NAMESPACE=alemairebe NAMESPACE=alemairebe
VERSION=1.32.2 VERSION=1.32.2
IMAGE=synapse IMAGE=synapse
.ONESHELL: # Applies to every targets in the file!
push: get decompress build push: get decompress build
dev: get decompress build_dev
get: get:
wget https://github.com/matrix-org/synapse/archive/refs/tags/v$(VERSION).tar.gz wget https://github.com/matrix-org/synapse/archive/refs/tags/v$(VERSION).tar.gz
@ -17,4 +17,11 @@ build:
--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \ --cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
--cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \ --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) \ --tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) \
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
-f Dockerfile ${IMAGE}-${VERSION}
build_dev:
docker buildx build --platform linux/amd64,linux/arm64,linux/arm \
--output type=tar,dest=synapse.tar \
--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
-f Dockerfile ${IMAGE}-${VERSION} -f Dockerfile ${IMAGE}-${VERSION}