Skip to content

Commit

Permalink
try this
Browse files Browse the repository at this point in the history
  • Loading branch information
MikesGlitch committed Mar 5, 2025
1 parent 9b4c322 commit bc9d992
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 12 deletions.
4 changes: 1 addition & 3 deletions packages/sync-server/docker/edge-alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPY yarn.lock package.json .yarnrc.yml tsconfig.json ./
RUN if [ "$(uname -m)" = "armv7l" ]; then yarn config set taskPoolConcurrency 2; yarn config set networkConcurrency 5; fi

# Copying workspace so @actual-app/web can be built
COPY bin/package-browser ./bin/package-browser
COPY ./bin/package-browser ./bin/package-browser
COPY ./packages/$BUILD_CONTEXT/ ./packages/$BUILD_CONTEXT/

# Building @actual-app/web
Expand All @@ -22,8 +22,6 @@ RUN rm ./node_modules/@actual-app/web ./node_modules/@actual-app/sync-server
COPY ./packages/desktop-client/package.json ./node_modules/@actual-app/web/package.json
COPY ./packages/desktop-client/build ./node_modules/@actual-app/web/build

RUN yarn workspaces focus @actual-app/sync-server --production

RUN if [ "$(uname -m)" = "armv7l" ]; then npm install bcrypt better-sqlite3 --build-from-source; fi

RUN mkdir /public
Expand Down
7 changes: 3 additions & 4 deletions packages/sync-server/docker/edge-ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ RUN apt-get update && apt-get install -y openssl jq
WORKDIR /app
COPY .yarn ./.yarn
COPY yarn.lock package.json .yarnrc.yml tsconfig.json ./
RUN if [ "$(uname -m)" = "armv7l" ]; then yarn config set taskPoolConcurrency 2; yarn config set networkConcurrency 5; fi

# RUN if [ "$(uname -m)" = "armv7l" ]; then yarn config set taskPoolConcurrency 2; yarn config set networkConcurrency 5; fi

# Copying workspace so @actual-app/web can be built
COPY bin/package-browser ./bin/package-browser
COPY ./bin/package-browser ./bin/package-browser
COPY ./packages/$BUILD_CONTEXT/ ./packages/$BUILD_CONTEXT/

# Building @actual-app/web
Expand All @@ -21,8 +22,6 @@ RUN rm ./node_modules/@actual-app/web ./node_modules/@actual-app/sync-server
COPY ./packages/desktop-client/package.json ./node_modules/@actual-app/web/package.json
COPY ./packages/desktop-client/build ./node_modules/@actual-app/web/build

RUN yarn workspaces focus @actual-app/sync-server --production

RUN mkdir /public
COPY artifacts.json /tmp/artifacts.json
RUN jq -r '[.artifacts[] | select(.workflow_run.head_branch == "master" and .workflow_run.head_repository_id == .workflow_run.repository_id)][0]' /tmp/artifacts.json > /tmp/latest-build.json
Expand Down
4 changes: 1 addition & 3 deletions packages/sync-server/docker/stable-alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPY yarn.lock package.json .yarnrc.yml tsconfig.json ./
RUN if [ "$(uname -m)" = "armv7l" ]; then yarn config set taskPoolConcurrency 2; yarn config set networkConcurrency 5; fi

# Copying workspace so @actual-app/web can be built
COPY bin/package-browser ./bin/package-browser
COPY ./bin/package-browser ./bin/package-browser
COPY ./packages/$BUILD_CONTEXT/ ./packages/$BUILD_CONTEXT/

# Building @actual-app/web
Expand All @@ -22,8 +22,6 @@ RUN rm ./node_modules/@actual-app/web ./node_modules/@actual-app/sync-server
COPY ./packages/desktop-client/package.json ./node_modules/@actual-app/web/package.json
COPY ./packages/desktop-client/build ./node_modules/@actual-app/web/build

RUN yarn workspaces focus @actual-app/sync-server --production

RUN if [ "$(uname -m)" = "armv7l" ]; then npm install bcrypt better-sqlite3 --build-from-source; fi

FROM alpine:3.18 AS prod
Expand Down
2 changes: 1 addition & 1 deletion packages/sync-server/docker/stable-ubuntu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ COPY yarn.lock package.json .yarnrc.yml tsconfig.json ./
RUN if [ "$(uname -m)" = "armv7l" ]; then yarn config set taskPoolConcurrency 2; yarn config set networkConcurrency 5; fi

# Copying workspace so @actual-app/web can be built
COPY bin/package-browser ./bin/package-browser
COPY ./bin/package-browser ./bin/package-browser
COPY ./packages/$BUILD_CONTEXT/ ./packages/$BUILD_CONTEXT/

# Building @actual-app/web
Expand Down
2 changes: 1 addition & 1 deletion sync-server.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ COPY .yarn ./.yarn
COPY yarn.lock package.json .yarnrc.yml tsconfig.json ./

# Copying workspace so @actual-app/web can be built
COPY bin/package-browser ./bin/package-browser
COPY ./bin/package-browser ./bin/package-browser
COPY ./packages/$BUILD_CONTEXT/ ./packages/$BUILD_CONTEXT/

# Building @actual-app/web
Expand Down

0 comments on commit bc9d992

Please sign in to comment.