Skip to content

Commit 3ea283e

Browse files
committed
dev: more container work
1 parent a2ff306 commit 3ea283e

File tree

21 files changed

+42
-61
lines changed

21 files changed

+42
-61
lines changed

.github/workflows/container.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
name: Build
2626
uses: docker/build-push-action@v4
2727
with:
28+
context: .
29+
file: ./Containerfile
2830
push: false
2931
load: true
3032
tags: torrust-tracker:local

Dockerfile renamed to Containerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ RUN mkdir -p /var/log/torrust/tracker; chown -R "${USER_ID}":"${USER_ID}" /var/l
115115
RUN mkdir -p /etc/torrust/tracker; chown -R "${USER_ID}":"${USER_ID}" /etc/torrust; chmod -R 2770 /etc/torrust
116116

117117
ENV ENV=/etc/profile
118-
COPY --chmod=0555 ./docker/entry.sh /usr/local/bin/entry.sh
118+
COPY --chmod=0555 ./share/docker/entry_script_sh /usr/local/bin/entry.sh
119119

120120
RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' >> /etc/profile
121121

@@ -126,13 +126,13 @@ ENTRYPOINT ["entry.sh"]
126126
## Torrust-Tracker (debug)
127127
FROM runtime as debug
128128
COPY --from=test_debug /app/ /usr/
129-
COPY --chmod=0644 ./docker/motd.debug /etc/motd
129+
COPY --chmod=0644 ./share/docker/motd.debug /etc/motd
130130
RUN env
131131
CMD ["sh"]
132132

133133
## Torrust-Tracker (release) (default)
134134
FROM runtime as release
135135
COPY --from=test /app/ /usr/
136-
COPY --chmod=0644 ./docker/motd.release /etc/motd
136+
COPY --chmod=0644 ./share/docker/motd.release /etc/motd
137137
# HEALTHCHECK CMD ["/usr/bin/wget", "--no-verbose", "--tries=1", "--spider", "localhost:${API_PORT}/version"]
138138
CMD ["/usr/bin/torrust-tracker"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ You can follow the [documentation](https://docs.rs/torrust-tracker/) to install
4141
git clone https://github.com/torrust/torrust-tracker.git \
4242
&& cd torrust-tracker \
4343
&& cargo build --release \
44-
&& mkdir -p ./storage/database \
44+
&& mkdir -p ./storage/lib/database \
4545
&& mkdir -p ./storage/ssl_certificates
4646
```
4747

bin/install-demo.sh

Lines changed: 0 additions & 27 deletions
This file was deleted.

bin/install.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.

cSpell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"codegen",
3030
"completei",
3131
"connectionless",
32+
"Containerfile",
3233
"Cyberneering",
3334
"distroless",
3435
"dockerhub",

docker/README.md renamed to contrib/dev-tools/containers/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ docker context use myacicontext
226226
docker volume create test-volume --storage-account torrustracker
227227
```
228228

229-
You need to create all the files needed by the application in the storage dir `storage/database`.
229+
You need to create all the files needed by the application in the storage dir `storage/lib/database`.
230230

231231
And finally, you can run the container:
232232

docker/bin/build.sh renamed to contrib/dev-tools/containers/docker-build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ echo "User id: $CURRENT_USER_ID"
88
USER_ID=$CURRENT_USER_ID
99
export USER_ID
1010

11-
1211
echo "Building docker image ..."
1312

1413
docker build --target debug --tag torrust-tracker:debug .
File renamed without changes.

0 commit comments

Comments
 (0)