Skip to content

Commit b218198

Browse files
authored
Merge pull request #4 from lost-rob0t/lost-rob0t-patch-actions
chore(github-actions): updates token var
2 parents 18a3301 + d289408 commit b218198

File tree

5 files changed

+32
-18
lines changed

5 files changed

+32
-18
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717
# Use docker.io for Docker Hub if empty
1818
REGISTRY: ghcr.io
1919
# github.repository as <account>/<repo>
20-
IMAGE_NAME: ${{ github.repository }}
20+
IMAGE_NAME: star-server
2121

2222

2323
jobs:
@@ -57,7 +57,7 @@ jobs:
5757
with:
5858
registry: ${{ env.REGISTRY }}
5959
username: ${{ github.actor }}
60-
password: ${{ secrets.GITHUB_TOKEN }}
60+
password: ${{ secrets.PTOKEN }}
6161

6262
# Extract metadata (tags, labels) for Docker
6363
# https://github.com/docker/metadata-action

Dockerfile

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,42 @@
11
FROM fukamachi/qlot:latest as build
2-
RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt set -x; \
2+
3+
RUN --mount=type=cache,target=/var/cache/apt \
4+
--mount=type=cache,target=/var/lib/apt \
5+
set -x; \
36
apt-get update && \
47
apt-get install -y \
5-
make \
6-
libffi-dev \
7-
pkg-config \
8-
librabbitmq-dev \
9-
build-essential
8+
make \
9+
libffi-dev \
10+
pkg-config \
11+
librabbitmq-dev \
12+
build-essential
1013

1114
RUN ros setup
1215

1316
COPY . /root/
1417

1518
WORKDIR /root/
1619
RUN qlot install
17-
RUN qlot exec make build
18-
RUN make install
20+
RUN qlot exec sbcl --non-interactive \
21+
--load source/starintel-gserver.asd \
22+
--eval '(ql:quickload :starintel-gserver)' \
23+
--eval "(sb-ext:save-lisp-and-die \"star-server\" :toplevel 'star::main :executable t)"
24+
25+
1926
FROM build as star-server
27+
28+
VOLUME /config
2029
EXPOSE 5000
30+
RUN echo '#!/bin/sh\n\
31+
set -e\n\
32+
# Check if /config/init.lisp exists; if not, use /root/init.lisp\n\
33+
INIT_FILE="/config/init.lisp"\n\
34+
if [ ! -f "$INIT_FILE" ]; then\n\
35+
echo "/config/init.lisp not found. Using default /root/example_configs/init.lisp."\n\
36+
INIT_FILE="/root/example_configs/init.lisp"\n\
37+
fi\n\
38+
# Execute the server with the determined init file\n\
39+
exec /root/star-server start -i "$INIT_FILE"' > /usr/local/bin/entrypoint.sh \
40+
&& chmod +x /usr/local/bin/entrypoint.sh
2141

22-
ENTRYPOINT ./star-server
23-
CMD [./star-server]
42+
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
File renamed without changes.

qlfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
ql serapeum :latest
33
ql alexandria :latest
44
ql babel :latest
5-
ql cl-json :latest
65
ql uuid :latest
76
ql anypool :latest
87
ql clack :latest

source/starintel-gserver.asd

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,11 @@
3030
#:cl-rabbit
3131
#:sento
3232
#:babel
33-
#:cl-json
34-
:uuid
35-
;; Not using
33+
#:uuid
3634
#:anypool
3735
#:clack
3836
#:ningle
39-
;; Will use wookie
4037
#:clingon
41-
;; Move to config
4238
#:slynk
4339
#:nhooks
4440
#:lparallel

0 commit comments

Comments
 (0)