Skip to content

Commit 77cb78f

Browse files
plowsofplowsof
committed
CI: use env variables for repo name / owner
1 parent 5e4f2ff commit 77cb78f

3 files changed

Lines changed: 20 additions & 15 deletions

File tree

‎.env‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
IMAGE_OWNER=plowsof

‎.github/workflows/build-docker.yml‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ jobs:
4343

4444
- name: transmission-show (pull or build)
4545
run: |
46-
tag_name="ghcr.io/plowsof/monero-torrent-show:latest"
46+
tag_name="ghcr.io/${GITHUB_REPOSITORY_OWNER}/monero-torrent-show:latest"
4747
case "${{ steps.changes.outputs.transmission }}" in
4848
true)
4949
docker build -f ./.github/workflows/docker/Dockerfile.transmission -t $tag_name .
50-
docker push -a ghcr.io/plowsof/monero-torrent-show
50+
docker push -a ghcr.io/${GITHUB_REPOSITORY_OWNER}/monero-torrent-show
5151
;;
5252
*)
5353
docker pull "$tag_name" || docker build -f ./.github/workflows/docker/Dockerfile.transmission -t "$tag_name" .
@@ -74,6 +74,10 @@ jobs:
7474
path: ./downloads
7575
key: monero-binaries-${{ env.VERSION }}-gui-${{ env.VERSION_GUI }}
7676

77+
- name: Set image owner for docker-compose
78+
run: |
79+
echo "IMAGE_OWNER=${{ github.repository_owner }}" >> $GITHUB_ENV
80+
7781
- if: ${{ steps.binaries_cache.outputs.cache-hit != 'true' }}
7882
name: Run remote profile
7983
run: |
@@ -83,8 +87,8 @@ jobs:
8387
else
8488
docker compose --profile remote up
8589
fi
86-
MAGNET_LINK=$(docker run --rm -v "./watch:/watch" ghcr.io/plowsof/monero-torrent-show:latest -m /watch/monero-$VERSION.torrent)
87-
MAGNET_LINK_GUI=$(docker run --rm -v "./watch:/watch" ghcr.io/plowsof/monero-torrent-show:latest -m /watch/monero-gui-$VERSION_GUI.torrent)
90+
MAGNET_LINK=$(docker run --rm -v "./watch:/watch" ghcr.io/${GITHUB_REPOSITORY_OWNER}/monero-torrent-show:latest -m /watch/monero-$VERSION.torrent)
91+
MAGNET_LINK_GUI=$(docker run --rm -v "./watch:/watch" ghcr.io/${GITHUB_REPOSITORY_OWNER}/monero-torrent-show:latest -m /watch/monero-gui-$VERSION_GUI.torrent)
8892
echo "MAGNET_LINK_REMOTE=$MAGNET_LINK" >> $GITHUB_ENV
8993
echo "MAGNET_LINK_REMOTE_GUI=$MAGNET_LINK_GUI" >> $GITHUB_ENV
9094
sudo rm ./watch/*
@@ -101,24 +105,24 @@ jobs:
101105
else
102106
docker compose --profile local up
103107
fi
104-
MAGNET_LINK=$(docker run --rm -v "./watch:/watch" ghcr.io/plowsof/monero-torrent-show:latest -m /watch/monero-$VERSION.torrent)
105-
MAGNET_LINK_GUI=$(docker run --rm -v "./watch:/watch" ghcr.io/plowsof/monero-torrent-show:latest -m /watch/monero-gui-$VERSION_GUI.torrent)
108+
MAGNET_LINK=$(docker run --rm -v "./watch:/watch" ghcr.io/${GITHUB_REPOSITORY_OWNER}/monero-torrent-show:latest -m /watch/monero-$VERSION.torrent)
109+
MAGNET_LINK_GUI=$(docker run --rm -v "./watch:/watch" ghcr.io/${GITHUB_REPOSITORY_OWNER}/monero-torrent-show:latest -m /watch/monero-gui-$VERSION_GUI.torrent)
106110
echo "MAGNET_LINK_LOCAL=$MAGNET_LINK" >> $GITHUB_ENV
107111
echo "MAGNET_LINK_LOCAL_GUI=$MAGNET_LINK_GUI" >> $GITHUB_ENV
108112
INFOHASH="${MAGNET_LINK#*btih:}"
109113
INFOHASH="${INFOHASH%%&*}"
110114
INFOHASH_GUI="${MAGNET_LINK_GUI#*btih:}"
111115
INFOHASH_GUI="${INFOHASH_GUI%%&*}"
112-
TORRENT_URL="https://github.com/plowsof/monero-torrent/releases/download/${GITHUB_REF_NAME}/monero-${VERSION}.torrent"
113-
TORRENT_URL_GUI="https://github.com/plowsof/monero-torrent/releases/download/${GITHUB_REF_NAME}/monero-gui-${VERSION_GUI}.torrent"
116+
TORRENT_URL="https://github.com/${GITHUB_REPOSITORY}/releases/download/${GITHUB_REF_NAME}/monero-${VERSION}.torrent"
117+
TORRENT_URL_GUI="https://github.com/${GITHUB_REPOSITORY}/releases/download/${GITHUB_REF_NAME}/monero-gui-${VERSION_GUI}.torrent"
114118
echo "INFOHASH=$INFOHASH" >> $GITHUB_ENV
115119
echo "INFOHASH_GUI=$INFOHASH_GUI" >> $GITHUB_ENV
116120
echo "TORRENT_URL=$TORRENT_URL" >> $GITHUB_ENV
117121
echo "TORRENT_URL_GUI=$TORRENT_URL_GUI" >> $GITHUB_ENV
118122
119123
- name: Push new image to ghcr
120124
if: github.ref_type == 'tag' || ( steps.changes.outputs.src == 'true' && github.ref == 'refs/heads/main' )
121-
run: docker push -a ghcr.io/plowsof/monero-torrent-build-env
125+
run: docker push -a ghcr.io/${GITHUB_REPOSITORY_OWNER}/monero-torrent-build-env
122126

123127
- if: ${{ steps.binaries_cache.outputs.cache-hit != 'true' }}
124128
name: Compare hashes for local/remote build and write summary
@@ -141,19 +145,19 @@ jobs:
141145
{
142146
echo "### CLI Torrent info"
143147
echo '```'
144-
docker run --rm -v "./watch:/watch" ghcr.io/plowsof/monero-torrent-show:latest /watch/monero-$VERSION.torrent
148+
docker run --rm -v "./watch:/watch" ghcr.io/${GITHUB_REPOSITORY_OWNER}/monero-torrent-show:latest /watch/monero-$VERSION.torrent
145149
echo '```'
146150
echo "### GUI Torrent info"
147151
echo '```'
148-
docker run --rm -v "./watch:/watch" ghcr.io/plowsof/monero-torrent-show:latest /watch/monero-gui-$VERSION_GUI.torrent
152+
docker run --rm -v "./watch:/watch" ghcr.io/${GITHUB_REPOSITORY_OWNER}/monero-torrent-show:latest /watch/monero-gui-$VERSION_GUI.torrent
149153
echo '```'
150154
echo "### 🧲 CLI Magnet Link"
151155
echo '```'
152-
docker run --rm -v "./watch:/watch" ghcr.io/plowsof/monero-torrent-show:latest -m /watch/monero-$VERSION.torrent
156+
docker run --rm -v "./watch:/watch" ghcr.io/${GITHUB_REPOSITORY_OWNER}/monero-torrent-show:latest -m /watch/monero-$VERSION.torrent
153157
echo '```'
154158
echo "### 🧲 GUI Magnet Link"
155159
echo '```'
156-
docker run --rm -v "./watch:/watch" ghcr.io/plowsof/monero-torrent-show:latest -m /watch/monero-gui-$VERSION_GUI.torrent
160+
docker run --rm -v "./watch:/watch" ghcr.io/${GITHUB_REPOSITORY_OWNER}/monero-torrent-show:latest -m /watch/monero-gui-$VERSION_GUI.torrent
157161
echo '```'
158162
} >> release-notes.md
159163

‎docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
monero-torrent-remote:
3-
image: ghcr.io/plowsof/monero-torrent-build-env:latest
3+
image: ghcr.io/${IMAGE_OWNER}/monero-torrent-build-env:latest
44
build:
55
context: .
66
environment:
@@ -17,7 +17,7 @@ services:
1717
profiles: ["remote"]
1818

1919
monero-torrent-local:
20-
image: ghcr.io/plowsof/monero-torrent-build-env:latest
20+
image: ghcr.io/${IMAGE_OWNER}/monero-torrent-build-env:latest
2121
build:
2222
context: .
2323
environment:

0 commit comments

Comments
 (0)