Skip to content

Commit

Permalink
fix for relocated scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
Jean-François Lamy committed Aug 15, 2024
1 parent dd9ed4f commit 24620d3
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 37 deletions.
30 changes: 15 additions & 15 deletions BUILD.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
The production build and deploy of this application is done using the fly CLI.

- `fly auth login` to select the account to which deployment will take place
- edit `deploy.sh` to confirm the application name
- if `--local-only` is present, start local Docker
- for a remote build, remove `--local-only`

- run `deploy.sh`
- fly will notice the presence of a Dockerfile
- fly will use the Docker file to build the application on a remote docker serve
- fly will deploy the application under the name indicated in deploy.sh

For development, the application is like all the other owlcms apps, but must run on Linux

- If running on Windows, open VS Code. At the bottom left, choose the option to run code remotely on WSL
The production build and deploy of this application is done using the fly CLI.

- `fly auth login` to select the account to which deployment will take place
- edit `deploy.sh` to confirm the application name
- if `--local-only` is present, start local Docker
- for a remote build, remove `--local-only`

- run `deploy.sh`
- fly will notice the presence of a Dockerfile
- fly will use the Docker file to build the application on a remote docker serve
- fly will deploy the application under the name indicated in deploy.sh

For development, the application is like all the other owlcms apps, but must run on Linux

- If running on Windows, open VS Code. At the bottom left, choose the option to run code remotely on WSL
- Run the `app.owlcms.fly.Main` class.
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ RUN mvn dependency:go-offline package -P production
# copy your other files
COPY ./src ./src
COPY ./frontend ./frontend
COPY ./scripts ./scripts
COPY ./*.sh ./
COPY ./*.toml ./
# compile the source code and package it in a jar file
Expand All @@ -35,6 +36,7 @@ EOF

COPY --from=stage1 /app/target/fly-manager.jar /app
COPY --from=stage1 /app/*.sh /app/
COPY --from=stage1 /app/scripts /app/scripts
COPY --from=stage1 /app/*.toml /app/
COPY --from=stage1 /usr/bin/envsubst /usr/bin
COPY --from=stage1 /app/src/main/resources/GeoLite2/GeoLite2-City.mmdb /app
Expand Down
19 changes: 0 additions & 19 deletions createSharedSecret.sh

This file was deleted.

File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions src/main/java/app/owlcms/fly/commands/FlyCtlCommands.java
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ public void appRestart(App app) {
doAppCommand(app, "fly apps restart --skip-health-checks " + app.name, null);
}

public void appSharedSecret(App app) {
doAppCommand(app, app.appType.create, null);
}
// private void appSharedSecret(App app) {
// doAppCommand(app, app.appType.create, null);
// }

String creationError;

Expand Down

0 comments on commit 24620d3

Please sign in to comment.