From 83dd635908c6b8a141fb238ab26b2a9560abd76d Mon Sep 17 00:00:00 2001 From: infogulch Date: Fri, 5 Mar 2021 16:55:19 -0600 Subject: [PATCH] Fix some things; Athens is not yet intended to be self-hosted on web yet :X --- CloudronManifest.json | 2 +- Dockerfile | 14 ++++++++++++-- start.sh | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CloudronManifest.json b/CloudronManifest.json index 593f797..9df13ae 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -4,7 +4,7 @@ "author": "Athens Project", "description": "Outliner note taking app similar to Roam Research", "tagline": "It's annoying to have to type a tagline for a test project", - "version": "0.0.1", + "version": "0.0.7", "healthCheckPath": "/", "httpPort": 3000, "addons": { diff --git a/Dockerfile b/Dockerfile index 619be5e..8fa6ab2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,27 @@ FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3ff04ea584faf46e92 -RUN mkdir -p /app/code +ARG VERSION=v1.0.0-beta.50 + WORKDIR /app/code RUN apt-get update -y && apt-get install -y leiningen && rm -rf /var/lib/apt/lists/* -ARG VERSION=v1.0.0-beta.49 RUN curl -L https://github.com/athensresearch/athens/archive/${VERSION}.tar.gz | tar -xz --strip-components 1 -f - RUN yarn --frozen-lockfile RUN lein do compile +RUN lein with-profile prod test-jvm +RUN lein prod COPY start.sh /app/code/start.sh +RUN chmod +x /app/code/start.sh + +RUN ln -sfn /app/data/pom.properties /app/code/target/classes/META-INF/maven/athens/athens/pom.properties + +RUN mkdir -p /run/shadow-cljs && \ + mv /app/code/.shadow-cljs/* /run/shadow-cljs && \ + rmdir /app/code/.shadow-cljs && \ + ln -s /app/code/.shadow-cljs /run/shadow-cljs CMD /app/code/start.sh diff --git a/start.sh b/start.sh index 0d21b08..f07b96f 100644 --- a/start.sh +++ b/start.sh @@ -4,5 +4,5 @@ set -eu chown -R cloudron:cloudron /app/data -exec /usr/local/bin/gosu cloudron:cloudron lein dev +exec /usr/local/bin/gosu cloudron:cloudron lein prod