diff --git a/Dockerfile b/Dockerfile index ad3da36..45ee636 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,36 +9,20 @@ WORKDIR /build RUN apk add --no-cache \ bash \ ca-certificates \ - openjdk21-jre-headless \ + openjdk21-jdk \ git \ curl -RUN curl -LO https://github.com/clojure/brew-install/releases/latest/download/linux-install.sh \ - && chmod +x linux-install.sh \ - && ./linux-install.sh -RUN git clone https://github.com/logseq/logseq.git --depth 1 \ - && cd logseq \ - && yarn install -WORKDIR /build/logseq -RUN git config --global --add safe.directory '*' \ - && git config --global user.email "builder@local" \ - && git config --global user.name "Docker Builder" \ - && git remote add 4shutosh https://github.com/4shutosh/logseq.git \ - && git fetch 4shutosh self_host/21_march_2026 \ - && git cherry-pick 477061ffb -WORKDIR /build/logseq/deps/db-sync +#RUN curl -O https://download.clojure.org/install/linux-install-1.11.1.1435.sh && chmod +x linux-install-1.11.1.1435.sh && ./linux-install-1.11.1.1435.sh +RUN curl -LO https://github.com/clojure/brew-install/releases/latest/download/linux-install.sh && chmod +x linux-install.sh && ./linux-install.sh +RUN git clone https://github.com/logseq/logseq.git && cd logseq && yarn install #build db-sync -RUN yarn install \ - && yarn build:node-adapter \ - && yarn install --production +RUN cd logseq/deps/db-sync && yarn install && yarn build:node-adapter && yarn install --production #copy to /logseq-sync for final image -RUN mkdir -p /logseq-sync/worker \ - && mv worker/dist /logseq-sync/worker \ - && mv node_modules package.json yarn.lock start.sh /logseq-sync +RUN cd logseq/deps/db-sync && mkdir -p /logseq-sync/worker && mv worker/dist /logseq-sync/worker && mv node_modules package.json yarn.lock start.sh /logseq-sync #final image FROM node:22-alpine3.21 COPY --from=builder /logseq-sync /logseq-sync -COPY start.sh /logseq-sync RUN apk add --no-cache \ bash \ curl diff --git a/docker-compose.yaml b/docker-compose.yaml index 19d4463..2010f34 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,16 +1,14 @@ services: logseq-sync: - environment: - DB_SYNC_LOG_LEVEL: "debug" container_name: logseq-sync image: "codeberg.org/kellya/logseq-sync:latest" ports: - 8787:8787 - - 8788:8788 volumes: - ./data:/logseq-sync/data # or use a named volume and uncomment the volume section below # - data:/logseq-sync/data restart: unless-stopped + network_mode: host #volumes: # data: diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index d34b7b9..0000000 --- a/nginx.conf +++ /dev/null @@ -1,23 +0,0 @@ -map $http_upgrade $connection_upgrade { - default upgrade; - '' close; -} - -server { - server_name sync.yourdomain.com; - client_max_body_size 100M; - location / { - proxy_pass http://127.0.0.1:8787; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_buffering off; - proxy_read_timeout 86400s; - proxy_send_timeout 86400s; - } - listen 80; -}