From f4468212de9f38a30655d76ae85cad0659b87296 Mon Sep 17 00:00:00 2001 From: Luis Pereira Date: Thu, 1 Jan 2026 15:26:23 +0000 Subject: [PATCH] fix: docker image build configured with posgres --- Dockerfile.asteroid | 13 ++++++++----- Makefile | 3 ++- docker/docker-compose.asteroid.yml | 3 +++ docker/radiance-default.conf.lisp | 7 +++---- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Dockerfile.asteroid b/Dockerfile.asteroid index ea970ab..c980148 100644 --- a/Dockerfile.asteroid +++ b/Dockerfile.asteroid @@ -16,22 +16,25 @@ RUN curl -O https://beta.quicklisp.org/quicklisp.lisp # Installs quicklisp and radiance RUN sbcl --eval "(load \"quicklisp.lisp\")" \ --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)" # 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" +# 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 +ARG BUILD_FLAGS +ENV BUILD_FLAGS=${BUILD_FLAGS} RUN make # Links binary to path 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 EXPOSE 8080 # Slynk server diff --git a/Makefile b/Makefile index 05f852f..46818e1 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,11 @@ PACKAGEUTILS=asteroid.app-utils OUT=asteroid ENTRY=-main BROWN_MM="Nil" +BUILD_FLAGS ?= "" .PHONY: $(OUT) $(OUT): clean - sbcl --load build-asteroid.lisp + sbcl $(BUILD_FLAGS) --load build-asteroid.lisp quicklisp-manifest.txt: *.asd sbcl --non-interactive \ diff --git a/docker/docker-compose.asteroid.yml b/docker/docker-compose.asteroid.yml index 47f6175..893c1a9 100644 --- a/docker/docker-compose.asteroid.yml +++ b/docker/docker-compose.asteroid.yml @@ -3,6 +3,9 @@ services: build: context: ../ dockerfile: Dockerfile.asteroid + # Uncomment for exit build on enter lisp debugger + # args: + # - BUILD_FLAGS="--disable-debugger" image: asteroid/app container_name: asteroid environment: diff --git a/docker/radiance-default.conf.lisp b/docker/radiance-default.conf.lisp index 1f18116..ea7c620 100644 --- a/docker/radiance-default.conf.lisp +++ b/docker/radiance-default.conf.lisp @@ -1,16 +1,15 @@ ; meta (:version 1.0 :package "RADIANCE-CORE") ((:interfaces (:admin . "r-simple-admin") (:auth . "r-simple-auth") (:ban . "r-simple-ban") (:cache . "r-simple-cache") - (:data-model . "r-simple-model") (:database . "i-lambdalite") - (:relational-database . "i-sqlite") (:logger . "i-verbose") + (:data-model . "r-simple-model") (:database . "i-postmodern") + (:relational-database . "i-postmodern") (:logger . "i-verbose") (:mail . "i-smtp") (:profile . "r-simple-profile") (:rate . "r-simple-rate") (:server . "i-hunchentoot") (:session . "r-simple-sessions") (:user . "r-simple-users")) (:versions . [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|) - ("r-data-model" :|1.0.1|) ("i-lambdalite" :|1.0.0|) - ("r-simple-users" :|1.0.1|) + ("r-data-model" :|1.0.1|) ("r-simple-users" :|1.0.1|) ("r-simple-errors" :|1.0.0|) ("i-verbose" :|1.0.0|) ("r-simple-auth" :|1.0.0|) ("r-simple-sessions" :|1.0.1|) ("r-ratify" :|1.0.0|) ("r-simple-rate" :|1.0.0|)