Skip to content

Commit 964886a

Browse files
authored
Fix Docker inconsistencies (#182)
1 parent 1660cac commit 964886a

File tree

6 files changed

+13
-26
lines changed

6 files changed

+13
-26
lines changed

.github/workflows/docker.yml

+7-5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@ name: Docker
33
on:
44
push:
55
branches: [main]
6-
tags:
7-
- 'v*'
6+
tags: ["v*"]
87

98
jobs:
109
Build-and-Push:
1110
runs-on: ubuntu-latest
11+
12+
# We want to filter out dependabot and pre-commit
13+
# automated pushes to main
14+
if: ${{ github.actor != 'dependabot[bot]'}} && ${{ github.actor != 'pre-commit-ci[bot]'}}
1215
steps:
1316
- name: Checkout
1417
uses: actions/checkout@v4
@@ -44,7 +47,6 @@ jobs:
4447
context: .
4548
file: ./docker/Dockerfile
4649
push: true
47-
cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/rodhaj:bot-build-cache
48-
cache-to: type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/rodhaj:bot-build-cache
49-
tags: ${{ steps.meta.outputs.tags }}
50+
cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/rodhaj-build-cache:bot
51+
cache-to: type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/rodhaj-build-cache:bot
5052
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,8 @@ jobs:
3131

3232

3333
Release:
34-
permissions:
35-
contents: write
36-
needs: Bundle
37-
3834
runs-on: ubuntu-latest
35+
needs: Bundle
3936
if: contains(github.event.head_commit.message, '#major') || contains(github.event.head_commit.message, '#minor') || contains(github.event.head_commit.message, '#patch')
4037
steps:
4138
- uses: actions/checkout@v4
@@ -52,7 +49,7 @@ jobs:
5249
uses: anothrNick/[email protected]
5350
id: tag_version
5451
env:
55-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
52+
GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
5653
WITH_V: true
5754
RELEASE_BRANCHES: main
5855

docker/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ ENV DEBIAN_FRONTEND=noninteractive
77

88
RUN apt-get update \
99
&& apt-get install -y --no-install-recommends \
10-
tini \
1110
bash \
12-
netcat-traditional \
1311
git \
12+
netcat-traditional \
13+
tini \
1414
&& apt-get clean
1515

1616
WORKDIR /rodhaj

docker/docker-compose.prod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: rodhaj_prod
33
services:
44
rodhaj:
55
container_name: rodhaj
6-
image: ghcr.io/transprogrammer/rodhaj:latest
6+
image: ghcr.io/transprogrammer/rodhaj:edge
77
volumes:
88
# Do not edit the next line. If you want to change the path of the configuration file, please edit the CONFIG_LOCATION variable
99
- ${CONFIG_LOCATION}:/rodhaj/bot/config.yml

docker/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: rodhaj
33
services:
44
rodhaj:
55
container_name: rodhaj
6-
image: ghcr.io/transprogrammer/rodhaj:latest
6+
image: ghcr.io/transprogrammer/rodhaj:edge
77
volumes:
88
# Do not edit the next line. If you want to change the path of the configuration file, please edit the CONFIG_LOCATION variable
99
- ${CONFIG_LOCATION}:/rodhaj/bot/config.yml

envs/docker.env

-12
This file was deleted.

0 commit comments

Comments
 (0)