Skip to content

Commit d5bc540

Browse files
committed
Merge branch 'jerry_0113' into 'develop'
refactor: adjust directory structure See merge request taco/openblocks-oss!9
2 parents d745b00 + aca9f31 commit d5bc540

File tree

633 files changed

+4
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

633 files changed

+4
-4
lines changed

deploy/docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM maven:3.8.4-openjdk-17-slim AS build-server
2-
COPY ./server /openblocks-server
2+
COPY ./server/api-service /openblocks-server
33
WORKDIR /openblocks-server
44
RUN --mount=type=cache,target=/root/.m2 mvn -f pom.xml clean package -DskipTests
55

@@ -86,8 +86,8 @@ COPY ./deploy/docker/templates/supervisord.conf /etc/supervisor/supervisord.conf
8686
COPY ./deploy/docker/templates/supervisord/* /etc/supervisor/conf.d/
8787

8888
# copy application.yml
89-
COPY ./server/openblocks-server/src/main/resources/selfhost/ce/application.yml /openblocks/env/
90-
COPY ./server/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml /openblocks/env2/
89+
COPY ./server/api-service/openblocks-server/src/main/resources/selfhost/ce/application.yml /openblocks/env/
90+
COPY ./server/api-service/openblocks-server/src/main/resources/selfhost/ce/application-selfhost.yml /openblocks/env2/
9191

9292
# Add bootstrapfile
9393
COPY ./deploy/docker/entrypoint.sh /openblocks/

server/.gitignore renamed to server/api-service/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.DS_Store
2-
.idea
2+
../.idea
33
*.iml
44
.env
55
.vscode/*

0 commit comments

Comments
 (0)