fix: docker image build configured with posgres

This commit is contained in:
Luis Pereira 2026-01-01 15:26:23 +00:00 committed by Brian O'Reilly
parent abb6d97a61
commit f4468212de
4 changed files with 16 additions and 10 deletions

View File

@ -16,22 +16,25 @@ RUN curl -O https://beta.quicklisp.org/quicklisp.lisp
# Installs quicklisp and radiance # Installs quicklisp and radiance
RUN sbcl --eval "(load \"quicklisp.lisp\")" \ RUN sbcl --eval "(load \"quicklisp.lisp\")" \
--eval "(quicklisp-quickstart:install)" \ --eval "(quicklisp-quickstart:install)" \
--eval "(ql-dist:install-dist \"http://dist.shirakumo.org/shirakumo.txt\" :prompt nil)" \ --eval "(ql-dist:install-dist \"http://dist.shirakumo.org/shirakumo.txt\" :prompt nil)" \
--eval "(ql:quickload :radiance)" --eval "(ql:quickload :radiance)"
# Makes the project workdir known as a quicklisp project # Makes the project workdir known as a quicklisp project
RUN mkdir -p $HOME/.config/common-lisp/source-registry.conf.d RUN mkdir -p "$HOME/.config/common-lisp/source-registry.conf.d"
RUN echo '(:tree "/app/")' >> "$HOME/.config/common-lisp/source-registry.conf.d/projects.conf" RUN echo '(:tree "/app/")' >> "$HOME/.config/common-lisp/source-registry.conf.d/projects.conf"
# Adds radiance system configuration file
RUN mkdir -p /root/.config/radiance/asteroid/radiance-core
COPY docker/radiance-default.conf.lisp /root/.config/radiance/asteroid/radiance-core/radiance-core.conf.lisp
# Builds Asteroid binary # Builds Asteroid binary
ARG BUILD_FLAGS
ENV BUILD_FLAGS=${BUILD_FLAGS}
RUN make RUN make
# Links binary to path # Links binary to path
ENV PATH="$PATH:/app" ENV PATH="$PATH:/app"
# Adds radiance system configuration file
COPY docker/radiance-default.conf.lisp $HOME/.config/radiance/default/radiance-core/radiance-core.conf.lisp
# Application # Application
EXPOSE 8080 EXPOSE 8080
# Slynk server # Slynk server

View File

@ -4,10 +4,11 @@ PACKAGEUTILS=asteroid.app-utils
OUT=asteroid OUT=asteroid
ENTRY=-main ENTRY=-main
BROWN_MM="Nil" BROWN_MM="Nil"
BUILD_FLAGS ?= ""
.PHONY: $(OUT) .PHONY: $(OUT)
$(OUT): clean $(OUT): clean
sbcl --load build-asteroid.lisp sbcl $(BUILD_FLAGS) --load build-asteroid.lisp
quicklisp-manifest.txt: *.asd quicklisp-manifest.txt: *.asd
sbcl --non-interactive \ sbcl --non-interactive \

View File

@ -3,6 +3,9 @@ services:
build: build:
context: ../ context: ../
dockerfile: Dockerfile.asteroid dockerfile: Dockerfile.asteroid
# Uncomment for exit build on enter lisp debugger
# args:
# - BUILD_FLAGS="--disable-debugger"
image: asteroid/app image: asteroid/app
container_name: asteroid container_name: asteroid
environment: environment:

View File

@ -1,16 +1,15 @@
; meta (:version 1.0 :package "RADIANCE-CORE") ; meta (:version 1.0 :package "RADIANCE-CORE")
((:interfaces (:admin . "r-simple-admin") (:auth . "r-simple-auth") ((:interfaces (:admin . "r-simple-admin") (:auth . "r-simple-auth")
(:ban . "r-simple-ban") (:cache . "r-simple-cache") (:ban . "r-simple-ban") (:cache . "r-simple-cache")
(:data-model . "r-simple-model") (:database . "i-lambdalite") (:data-model . "r-simple-model") (:database . "i-postmodern")
(:relational-database . "i-sqlite") (:logger . "i-verbose") (:relational-database . "i-postmodern") (:logger . "i-verbose")
(:mail . "i-smtp") (:profile . "r-simple-profile") (:rate . "r-simple-rate") (:mail . "i-smtp") (:profile . "r-simple-profile") (:rate . "r-simple-rate")
(:server . "i-hunchentoot") (:session . "r-simple-sessions") (:server . "i-hunchentoot") (:session . "r-simple-sessions")
(:user . "r-simple-users")) (:user . "r-simple-users"))
(:versions (:versions
. [hash-table equal ("radiance-core" :|2.2.0|) ("i-hunchentoot" :|1.1.0|) . [hash-table equal ("radiance-core" :|2.2.0|) ("i-hunchentoot" :|1.1.0|)
("asteroid" :|0.0.0|) ("i-log4cl" :|1.0.0|) ("r-clip" :|1.0.0|) ("asteroid" :|0.0.0|) ("i-log4cl" :|1.0.0|) ("r-clip" :|1.0.0|)
("r-data-model" :|1.0.1|) ("i-lambdalite" :|1.0.0|) ("r-data-model" :|1.0.1|) ("r-simple-users" :|1.0.1|)
("r-simple-users" :|1.0.1|)
("r-simple-errors" :|1.0.0|) ("i-verbose" :|1.0.0|) ("r-simple-errors" :|1.0.0|) ("i-verbose" :|1.0.0|)
("r-simple-auth" :|1.0.0|) ("r-simple-sessions" :|1.0.1|) ("r-simple-auth" :|1.0.0|) ("r-simple-sessions" :|1.0.1|)
("r-ratify" :|1.0.0|) ("r-simple-rate" :|1.0.0|) ("r-ratify" :|1.0.0|) ("r-simple-rate" :|1.0.0|)