Skip to content

Commit 630b4d2

Browse files
Organize root directory
* move fly scripts and python files into `scripts/` * move quartz and server properties into `config/` * move Docker related scripts into `Docker`
1 parent 2e69ccf commit 630b4d2

19 files changed

+17
-52
lines changed

.github/workflows/fly-prod-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
steps:
1818
- uses: actions/checkout@v4
1919
- uses: superfly/flyctl-actions/setup-flyctl@master
20-
- run: flyctl deploy --remote-only -c fly.production.toml --build-arg CI_COMMIT_SHA=`git rev-parse HEAD`
20+
- run: flyctl deploy --remote-only -c scripts/fly.production.toml --build-arg CI_COMMIT_SHA=`git rev-parse HEAD`
2121
env:
2222
FLY_API_TOKEN: ${{ secrets.FLY_PROD_API_TOKEN }}

.github/workflows/fly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020
- uses: superfly/flyctl-actions/setup-flyctl@master
21-
- run: flyctl deploy --remote-only --build-arg CI_COMMIT_SHA=`git rev-parse HEAD`
21+
- run: flyctl deploy --remote-only -c scripts/fly.toml --build-arg CI_COMMIT_SHA=`git rev-parse HEAD`
2222
env:
2323
FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ RUN mvn -f /app/pom.xml -DskipTests clean dependency:resolve dependency:go-offli
1313

1414
COPY proxyserver /app/proxyserver
1515
RUN mvn -f /app/pom.xml -DskipTests package -PnoDockerTests -Dbuild.revision=$CI_COMMIT_SHA && cp /app/proxyserver/target/efspserver-with-deps.jar /app/
16-
COPY LICENSE client_sign.propertie[s] quartz.properties Suffolk.pf[x] extract-tls-secrets-4.0.0.ja[r] jacocoagent.ja[r] /app/
17-
COPY docker_run_dev.sh /app/
16+
COPY config /app/
17+
# The `[]` is an optional COPY: doesn't copy if those files aren't there (https://stackoverflow.com/a/46801962/11416267)
18+
# They are needed for Tyler API usage
19+
COPY LICENSE extract-tls-secrets-4.0.0.ja[r] jacocoagent.ja[r] /app/
20+
COPY Docker/docker_run_dev.sh /app/
1821

1922
EXPOSE 9000
2023
CMD [ "/bin/sh", "/app/docker_run_dev.sh" ]
@@ -23,10 +26,9 @@ FROM eclipse-temurin:21.0.7_6-jre-alpine AS release
2326
ARG CI_COMMIT_SHA
2427
LABEL git-commit=$CI_COMMIT_SHA
2528
COPY --from=build /app/proxyserver/target/efspserver-with-deps.jar /app/
26-
# The `[]` is an optional COPY: doesn't copy if those files aren't there (https://stackoverflow.com/a/46801962/11416267)
27-
# They are needed for Tyler API usage
28-
COPY LICENSE client_sign.propertie[s] quartz.properties Suffolk.pf[x] /app/
29-
COPY docker_run_script.sh fly_startup_script.sh /app/
29+
COPY config /app/
30+
COPY LICENSE config/client_sign.propertie[s] config/quartz.properties config/Suffolk.pf[x] /app/
31+
COPY Docker/docker_run_script.sh Docker/fly_startup_script.sh /app/
3032

3133
EXPOSE 9000
3234
CMD [ "/bin/sh", "/app/docker_run_script.sh" ]

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
env_file: .env
2323
volumes:
2424
- data-volume:/var/lib/postgresql/data
25-
- ./postgres-config:/etc/postgresql
25+
- ./config/postgres-config:/etc/postgresql
2626

2727
volumes:
2828
data-volume:

0 commit comments

Comments
 (0)