Compare commits
14 Commits
9ceb562b81
...
v0.0.7
| Author | SHA1 | Date | |
|---|---|---|---|
| 0d1d6dfc95 | |||
| aa2ecc57ea | |||
| aeba4b2856 | |||
|
7c5f27eb21
|
|||
| 449ca6e3c8 | |||
| 8ece09bf12 | |||
| d9ade89461 | |||
| 9f3b2394c0 | |||
| 1bc4808204 | |||
|
c4e4cae577
|
|||
|
bb9c01246c
|
|||
| afd279c323 | |||
|
7900615c0a
|
|||
| 1c2e971560 |
@@ -15,7 +15,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||||
- uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
- uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
- run: docker build --load -t ci-image:${{ github.sha }} .
|
- run: docker build --load -t ci-image:${{ github.sha }} .
|
||||||
- run: bash tests/test.sh ci-image:${{ github.sha }}
|
- run: bash tests/test.sh ci-image:${{ github.sha }}
|
||||||
build-push:
|
build-push:
|
||||||
@@ -25,8 +25,8 @@ jobs:
|
|||||||
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
- uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
- uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
|
- uses: docker/login-action@c99871dec2022cc055c062a10cc1a1310835ceb4 # v4
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
@@ -35,12 +35,12 @@ jobs:
|
|||||||
TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
|
TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
|
||||||
echo "tag=$TAG" >> $GITHUB_OUTPUT
|
echo "tag=$TAG" >> $GITHUB_OUTPUT
|
||||||
- id: meta
|
- id: meta
|
||||||
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
|
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6
|
||||||
with:
|
with:
|
||||||
images: jcabillot/rssbridge
|
images: jcabillot/rssbridge
|
||||||
tags: |
|
tags: |
|
||||||
type=raw,value=${{ steps.get-latest-tag.outputs.tag }}-latest,enable=${{ steps.get-latest-tag.outputs.tag != '' }}
|
type=raw,value=${{ steps.get-latest-tag.outputs.tag }}-latest,enable=${{ steps.get-latest-tag.outputs.tag != '' }}
|
||||||
- uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
|
- uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||||
- uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
- uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
- run: docker build --load -t ci-image:${{ github.sha }} .
|
- run: docker build --load -t ci-image:${{ github.sha }} .
|
||||||
- run: bash tests/test.sh ci-image:${{ github.sha }}
|
- run: bash tests/test.sh ci-image:${{ github.sha }}
|
||||||
build:
|
build:
|
||||||
@@ -23,7 +23,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||||
- uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
- uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
- run: docker build -t jcabillot/rssbridge:${{ github.sha }} .
|
- run: docker build -t jcabillot/rssbridge:${{ github.sha }} .
|
||||||
tag:
|
tag:
|
||||||
needs: [build]
|
needs: [build]
|
||||||
|
|||||||
@@ -15,6 +15,6 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||||
- uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
- uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
- run: docker build --load -t ci-image:${{ github.sha }} .
|
- run: docker build --load -t ci-image:${{ github.sha }} .
|
||||||
- run: bash tests/test.sh ci-image:${{ github.sha }}
|
- run: bash tests/test.sh ci-image:${{ github.sha }}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||||
- uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
- uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
- run: docker build --load -t ci-image:${{ github.sha }} .
|
- run: docker build --load -t ci-image:${{ github.sha }} .
|
||||||
- run: bash tests/test.sh ci-image:${{ github.sha }}
|
- run: bash tests/test.sh ci-image:${{ github.sha }}
|
||||||
build-push:
|
build-push:
|
||||||
@@ -23,19 +23,19 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
|
||||||
- uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
|
- uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4
|
||||||
- uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
|
- uses: docker/login-action@c99871dec2022cc055c062a10cc1a1310835ceb4 # v4
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
- id: meta
|
- id: meta
|
||||||
uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
|
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6
|
||||||
with:
|
with:
|
||||||
images: jcabillot/rssbridge
|
images: jcabillot/rssbridge
|
||||||
tags: |
|
tags: |
|
||||||
type=ref,event=tag
|
type=ref,event=tag
|
||||||
type=ref,event=tag,suffix=-latest
|
type=ref,event=tag,suffix=-latest
|
||||||
- uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0
|
- uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
|
|||||||
+2
-3
@@ -16,8 +16,7 @@ RUN curl -s -L "https://github.com/RSS-Bridge/rss-bridge/tarball/master/" -o /tm
|
|||||||
# Configure RSS-Bridge
|
# Configure RSS-Bridge
|
||||||
RUN echo "*" > "/app/public/whitelist.txt" && \
|
RUN echo "*" > "/app/public/whitelist.txt" && \
|
||||||
mkdir -p /app/public/cache && \
|
mkdir -p /app/public/cache && \
|
||||||
chown -R www-data:www-data /app/public
|
chown -R www-data:www-data /app/public && \
|
||||||
|
chmod -R 775 /app/public/cache
|
||||||
RUN chown www-data:www-data /data/caddy && chmod 2770 /data/caddy
|
|
||||||
|
|
||||||
USER www-data
|
USER www-data
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
|
||||||
"customManagers": [
|
|
||||||
{
|
|
||||||
"customType": "regex",
|
|
||||||
"description": "Detect ARG VERSION pin for jcabillot/phpapache base image",
|
|
||||||
"managerFilePatterns": [
|
|
||||||
"/^Dockerfile$/"
|
|
||||||
],
|
|
||||||
"matchStrings": [
|
|
||||||
"ARG\\s+VERSION=\"(?<currentValue>[^\"]+)\""
|
|
||||||
],
|
|
||||||
"depNameTemplate": "jcabillot/phpapache",
|
|
||||||
"datasourceTemplate": "docker"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user