Compare commits
2 Commits
master
..
899c9fa41e
| Author | SHA1 | Date | |
|---|---|---|---|
| 899c9fa41e | |||
| f62494ab6b |
@@ -17,24 +17,44 @@ jobs:
|
||||
dockerfile: Dockerfile
|
||||
failure-threshold: error
|
||||
|
||||
build-and-test:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
needs: lint
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
|
||||
- name: Build image
|
||||
run: docker build -t ci-image:${{ github.sha }} .
|
||||
- name: Save image
|
||||
run: docker save ci-image:${{ github.sha }} -o image.tar
|
||||
- uses: ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2
|
||||
with:
|
||||
name: docker-image
|
||||
path: image.tar
|
||||
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
needs: build
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
|
||||
- uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7
|
||||
with:
|
||||
name: docker-image
|
||||
- name: Load image
|
||||
run: docker load < image.tar
|
||||
- name: Run tests
|
||||
run: bash tests/test.sh ci-image:${{ github.sha }}
|
||||
|
||||
push:
|
||||
runs-on: ubuntu-latest
|
||||
needs: build-and-test
|
||||
needs: test
|
||||
if: github.event_name != 'pull_request'
|
||||
steps:
|
||||
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10
|
||||
- name: Build image
|
||||
run: docker build -t ci-image:${{ github.sha }} .
|
||||
- uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7
|
||||
with:
|
||||
name: docker-image
|
||||
- name: Load image
|
||||
run: docker load < image.tar
|
||||
- uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
image: docker:latest
|
||||
image: "docker:latest"
|
||||
|
||||
services:
|
||||
- "docker:dind"
|
||||
|
||||
+7
-3
@@ -1,13 +1,17 @@
|
||||
FROM ubuntu:26.04
|
||||
FROM "ubuntu:18.04"
|
||||
# Il n'est pas possible d'utiliser alpine,
|
||||
# cela pose problème avec le script de post-install qui dépends vraiment de glibc.
|
||||
# Il faudrait alors partir sur une full recompilation de calibre (sans certitudes sur le bon fonctionnement).
|
||||
LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>"
|
||||
|
||||
RUN export DEBIAN_FRONTEND="noninteractive" && \
|
||||
export BUILD_PACKAGES="wget xz-utils" && \
|
||||
export RUNTIME_PACKAGES="python xvfb libfontconfig libxrender1 libxcomposite1" && \
|
||||
apt-get -qq update && \
|
||||
apt-get -qq --yes install python3 xvfb libfontconfig1 libxrender1 libxcomposite1 libegl1 libopengl0 libxcb-cursor0 calibre && \
|
||||
ln -sf /usr/bin/python3 /usr/bin/python && \
|
||||
apt-get -qq --yes install ${BUILD_PACKAGES} ${RUNTIME_PACKAGES} && \
|
||||
wget -nv -O- https://download.calibre-ebook.com/linux-installer.py | python -c "import sys; main=lambda:sys.stderr.write('Download failed\n'); exec(sys.stdin.read()); main()" && \
|
||||
apt-get -qq --yes remove --purge ${BUILD_PACKAGES} && \
|
||||
apt-get -qq --yes autoremove --purge && \
|
||||
apt-get -qq --yes clean all && \
|
||||
rm -rf "/usr/share/doc/"* \
|
||||
"/usr/src/"* \
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"gitlabci": {
|
||||
"enabled": true
|
||||
},
|
||||
"customManagers": [
|
||||
{
|
||||
"customType": "regex",
|
||||
"description": "Track Tini version from ENV-based ADD download URL",
|
||||
"managerFilePatterns": ["/^Dockerfile$/"],
|
||||
"matchStrings": ["TINI_VERSION\\s+\"(?<currentValue>[^\"]+)\""],
|
||||
"depNameTemplate": "krallin/tini",
|
||||
"datasourceTemplate": "github-releases",
|
||||
"versioningTemplate": "semver"
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user