Skip to content

Commit

Permalink
Merge branch 'update-deps' into 'master'
Browse files Browse the repository at this point in the history
Update deps

See merge request ix.ai/cioban!80
  • Loading branch information
tlex committed Aug 27, 2022
2 parents 96e70e9 + 1b0429f commit cbda444
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ variables:
DOCKERHUB_REPO_NAME: cioban
GITHUB_REPO_NAME: ix-ai/cioban
ENABLE_ARM64: 'true'
ENABLE_ARMv7: 'true'
ENABLE_ARMv6: 'true'
ENABLE_386: 'true'
include:
- project: ix.ai/ci-templates
file: "/python-project.yml"
Expand Down
44 changes: 40 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,47 @@
FROM docker:latest
FROM alpine:latest as builder

COPY cioban/requirements.txt /work/cioban/requirements.txt

ENV CRYPTOGRAPHY_DONT_BUILD_RUST="1"

RUN set -xeu; \
mkdir -p /work/wheels; \
apk add \
python3-dev \
openssl-dev \
gcc \
musl-dev \
libffi-dev \
make \
openssl-dev \
cargo \
; \
python3 -m ensurepip; \
pip3 install -U \
wheel \
pip

RUN pip3 wheel --prefer-binary -r /work/cioban/requirements.txt -w /work/wheels

FROM alpine:latest

LABEL maintainer="[email protected]" \
ai.ix.repository="ix.ai/cioban"

COPY cioban/requirements.txt /cioban/requirements.txt
COPY --from=builder /work /

RUN apk add --no-cache python3 py3-cryptography py3-pip && \
pip3 install --no-cache-dir -r /cioban/requirements.txt
RUN set -xeu; \
ls -lashi /wheels; \
apk add --no-cache python3; \
python3 -m ensurepip; \
pip3 install --no-cache-dir -U pip;\
pip3 install \
--no-index \
--no-cache-dir \
--find-links /wheels \
--requirement /cioban/requirements.txt \
; \
rm -rf /wheels

COPY cioban/ /cioban
COPY cioban.sh /usr/local/bin/cioban.sh
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ The following labels are supported:
## Examples

### Start `registry.gitlab.com/ix.ai/cioban`as a Docker Swarm service

```sh
docker service create \
--name cioban \
Expand Down Expand Up @@ -141,6 +142,7 @@ networks:
### Prometheus metrics
In addition to the metrics exporter by [prometheus/client_python/](https://github.com/prometheus/client_python/), the following metrics are exposed by cioban:
```
# HELP update_run_seconds Time spent processing updates
# TYPE update_run_seconds summary
Expand Down Expand Up @@ -178,6 +180,7 @@ Please note, `armv7` and `armv6` are no longer available starting with version 0
* `dev-master` - the last build on the master branch

## Resources

* GitLab: https://gitlab.com/ix.ai/cioban
* GitHub: https://github.com/ix-ai/cioban
* GitLab Registry: `registry.gitlab.com/ix.ai/cioban` - https://gitlab.com/ix.ai/cioban/container_registry
Expand Down
2 changes: 1 addition & 1 deletion cioban/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
prometheus_client==0.14.1
docker==5.0.3
docker==6.0.0
pause==0.3
pygelf==0.4.2
ix-notifiers==0.0.259196408

0 comments on commit cbda444

Please sign in to comment.