Skip to content
This repository was archived by the owner on May 19, 2024. It is now read-only.

Commit ddea946

Browse files
authored
Refactor codebase for better navigation (#53)
1 parent efbf1f2 commit ddea946

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

.github/workflows/ghcr.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
REGISTRY: ghcr.io
1313
IMAGE_NAME: wanjohiryan/warp
1414
BASE_TAG_PREFIX: x264
15-
CHROME_TAG_PREFIX: firefox-x264
15+
BRAVE_TAG_PREFIX: brave-x264
1616

1717
jobs:
1818
build-git-h264-base:
@@ -53,12 +53,12 @@ jobs:
5353
uses: docker/build-push-action@v4
5454
with:
5555
context: ./
56-
file: .docker/base/Dockerfile
56+
file: docker/base/Dockerfile
5757
push: true
5858
tags: ${{ steps.meta.outputs.tags }}
5959
labels: ${{ steps.meta.outputs.labels }}
6060

61-
build-git-h264-chrome:
61+
build-git-h264-brave:
6262
runs-on: ubuntu-latest
6363
needs: build-git-h264-base
6464
permissions:
@@ -83,7 +83,7 @@ jobs:
8383
id: meta
8484
uses: docker/metadata-action@v4
8585
with:
86-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.CHROME_TAG_PREFIX }}
86+
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.BRAVE_TAG_PREFIX }}
8787
flavor: |
8888
latest=${{github.event_name == 'release'}}
8989
#tag on release, and a nightly build for 'dev'
@@ -98,7 +98,7 @@ jobs:
9898
uses: docker/build-push-action@v4
9999
with:
100100
context: ./
101-
file: examples/firefox/Dockerfile
101+
file: docker/brave/Dockerfile
102102
push: true
103103
tags: ${{ steps.meta.outputs.tags }}
104104
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/pull-request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: docker/build-push-action@v4
2121
with:
2222
context: ./
23-
file: .docker/base/Dockerfile
23+
file: docker/base/Dockerfile
2424
push: false
2525
load: true
2626
tags: warp:latest
@@ -46,7 +46,7 @@ jobs:
4646
uses: docker/build-push-action@v4
4747
with:
4848
context: ./
49-
file: .docker/base/Dockerfile
49+
file: docker/base/Dockerfile
5050
outputs: type=docker,dest=/tmp/warp.tar
5151
tags: warp:latest
5252

@@ -81,7 +81,7 @@ jobs:
8181
run: |
8282
set -o pipefail
8383
84-
cp examples/brave/Dockerfile .
84+
cp docker/brave/Dockerfile .
8585
8686
docker build --tag warp:brave --build-arg WARP_IMAGE=warp:latest .
8787

.docker/base/Dockerfile renamed to docker/base/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,16 @@ ENTRYPOINT [ "/usr/bin/tini","--" ]
104104
#
105105
#Copy config files
106106
#
107-
COPY .docker/base/entrypoint.sh /etc/warp/entrypoint.sh
107+
COPY docker/base/entrypoint.sh /etc/warp/entrypoint.sh
108108
RUN chmod +x /etc/warp/entrypoint.sh
109109

110-
COPY .docker/base/run-bash.sh /etc/warp/run-bash.sh
110+
COPY docker/base/run-bash.sh /etc/warp/run-bash.sh
111111
RUN chmod +x /etc/warp/run-bash.sh
112112

113-
COPY .docker/base/generate-certs.sh /certs/generate-certs.sh
113+
COPY docker/base/generate-certs.sh /certs/generate-certs.sh
114114
RUN chmod +x /certs/generate-certs.sh
115115

116-
COPY .docker/base/ffmpeg.sh /etc/warp/ffmpeg.sh
116+
COPY docker/base/ffmpeg.sh /etc/warp/ffmpeg.sh
117117
RUN chmod +x /etc/warp/ffmpeg.sh
118118

119119
COPY --from=warp /src /usr/bin/warp
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

examples/brave/Dockerfile renamed to docker/brave/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ RUN wget -qO - https://brave-browser-apt-release.s3.brave.com/brave-core.asc | s
2121
#
2222
#Copy entrypoint into a directory the parent entrypoint will see
2323
#
24-
COPY examples/brave/brave.sh /etc/warp/entrypoint.d/brave.sh
24+
COPY docker/brave/brave.sh /etc/warp/entrypoint.d/brave.sh
2525
RUN sudo chmod +x /etc/warp/entrypoint.d/brave.sh
File renamed without changes.

0 commit comments

Comments
 (0)