Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use haddock3 install which comes with cns executable #154

Merged
merged 10 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ services:
- type: bind
source: ../deploy/arq/bartender-config.yaml
target: /opt/bartender/config.yaml
- type: bind
source: ../deploy/cns
target: /opt/haddock3/bin/cns
read_only: true
- bartender-certs:/certs:ro
- bartender-job-data:/jobs
depends_on:
Expand Down Expand Up @@ -109,10 +105,6 @@ services:
- type: bind
source: ../deploy/arq/bartender-config.yaml
target: /opt/bartender/config.yaml
- type: bind
source: ../deploy/cns
target: /opt/haddock3/bin/cns
read_only: true
- bartender-job-data:/jobs
depends_on:
redis:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
with:
images: ghcr.io/i-vresse/bartender
labels: |
org.opencontainers.image.description=bartender web service with haddock3, lightdock, gdock executables. Image does not contain real cns executable, downstream should bind or copy it to /opt/haddock3/bin/cns.
org.opencontainers.image.description=bartender web service with haddock3, lightdock, gdock executables. Image does contain cns executable, which is free for non-profit users, see https://github.com/haddocking/haddock3/blob/main/DISCLAIMER.md.
org.opencontainers.image.url=https://github.com/i-VRESSE/haddock3-webapp/blob/main/deploy/README.md#images
org.opencontainers.image.documentation.url=https://github.com/i-VRESSE/haddock3-webapp/blob/main/deploy/README.md#images
- name: Login to DockerHub
Expand Down Expand Up @@ -142,8 +142,6 @@ jobs:
run: npm ci
- name: Install Playwright Browsers
run: npx playwright install --with-deps
- name: Fake cns
run: cp /usr/bin/uptime deploy/cns
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ node_modules
/public_key.pem

Caddyfile
/deploy/cns
/test-results/
/playwright-report/
/blob-report/
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ Web app->>+Bartender: State of job
Web app->>+Bartender: Result of job
```

## Deployment

Deployments with containers are explained in [deploy/README.md](deploy/README.md).

## Setup

The web app is written in [Node.js](https://nodejs.org/) to install dependencies run:
Expand Down Expand Up @@ -94,7 +98,6 @@ See [docs/scenarios.md](docs/scenarios.md) for more information on how the web a
### Develop inside devcontainer

You can develop inside a [devcontainer](https://containers.dev/) inside Visual Studio Code. The devcontainer includes all services required by the webapp.
You just have to supply the cns executable as `./deploy/cns` file, see [deployment](deploy/README.md), before building/starting the containers.

When you exit VS code the containers will keep running, kill by running `docker compose -f .devcontainer/docker-compose.yml -p haddock3-webapp_devcontainer down` in the terminal or in VS Code reopen folder outside container.

Expand Down Expand Up @@ -160,7 +163,7 @@ npm run typecheck

For testing see [docs/testing.md](docs/testing.md).

## Deployment
## Start production server

First, build your app for production:

Expand All @@ -175,8 +178,6 @@ export $(cat .env |grep -v '#' |xargs)
npm start
```

Other deployments with containers are explained in [deploy/README.md](deploy/README.md).

## Stack

The tech stack is explained in [docs/stack.md](docs/stack.md).
Loading
Loading