-
Notifications
You must be signed in to change notification settings - Fork 26
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
Fork #405
Draft
mgrunbauer
wants to merge
18
commits into
master
Choose a base branch
from
fork
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Fork #405
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
549e6d1
Experiment with forking adaguc
mgrunbauer 1d96bc1
Make fork server work in docker
mgrunbauer 14c33f9
Make benchmark tool work
mgrunbauer 470ce3b
Ignore child signal to stop zombies
mgrunbauer 963cff0
Write socket in ADAGUC_PATH dir
mgrunbauer 622e890
Handle child signals and send status to python
mgrunbauer 21a491b
Move fork logic to separate file
mgrunbauer 3fbbc85
Refactor CGIRunner.py
mgrunbauer 8085ef1
Fix socket file path and don't strip last 4 bytes
mgrunbauer 97cf0d1
Handle concurrent child exits, passes benchmark
mgrunbauer 834167a
Ignore arm64 for testing
mgrunbauer 70f4b10
Merge branch 'master' into fork
mgrunbauer 414acfe
Fixes after merge from master
mgrunbauer c76149b
Handle child events correctly
mgrunbauer d4445ac
Clean old procs in bg thread
mgrunbauer 0770c96
Make child proc timeout configurable
mgrunbauer 3bbf919
Begin on environment variable docs
mgrunbauer a49a6ff
Add CDBDebug/Warn/Err prints for clean thread
mgrunbauer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,38 +15,38 @@ jobs: | |
- name: Check out the repo | ||
uses: actions/checkout@v4 | ||
|
||
- name: Build and potentially push Docker image | ||
uses: docker/build-push-action@v5 | ||
with: | ||
context: . | ||
# ensure latest base image is used | ||
pull: true | ||
push: false | ||
tags: adaguc-server | ||
- name: Run Trivy vulnerability scanner | ||
uses: aquasecurity/[email protected] | ||
with: | ||
image-ref: 'adaguc-server' | ||
format: 'table' | ||
exit-code: '1' | ||
ignore-unfixed: true | ||
vuln-type: 'os,library' | ||
trivyignores: .trivyignore | ||
# severity: 'CRITICAL,HIGH' | ||
docker-build-and-publish: | ||
name: Build Docker image and potentially push to Docker Hub | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Check out the repo | ||
uses: actions/checkout@v4 | ||
# - name: Build and potentially push Docker image | ||
# uses: docker/build-push-action@v5 | ||
# with: | ||
# context: . | ||
# # ensure latest base image is used | ||
# pull: true | ||
# push: false | ||
# tags: adaguc-server | ||
# - name: Run Trivy vulnerability scanner | ||
# uses: aquasecurity/[email protected] | ||
# with: | ||
# image-ref: 'adaguc-server' | ||
# format: 'table' | ||
# exit-code: '1' | ||
# ignore-unfixed: true | ||
# vuln-type: 'os,library' | ||
# trivyignores: .trivyignore | ||
# # severity: 'CRITICAL,HIGH' | ||
# docker-build-and-publish: | ||
# name: Build Docker image and potentially push to Docker Hub | ||
# runs-on: ubuntu-latest | ||
# steps: | ||
# - name: Check out the repo | ||
# uses: actions/checkout@v4 | ||
|
||
- name: Set up QEMU | ||
uses: docker/setup-qemu-action@v3 | ||
with: | ||
platforms: 'arm64' | ||
# - name: Set up QEMU | ||
# uses: docker/setup-qemu-action@v3 | ||
# with: | ||
# platforms: 'arm64' | ||
|
||
- name: Set up Docker Buildx | ||
uses: docker/setup-buildx-action@v3 | ||
# - name: Set up Docker Buildx | ||
# uses: docker/setup-buildx-action@v3 | ||
|
||
- name: Log in to Docker Hub | ||
if: github.repository == 'KNMI/adaguc-server' | ||
|
@@ -65,9 +65,9 @@ jobs: | |
uses: docker/build-push-action@v5 | ||
with: | ||
context: . | ||
platforms: linux/amd64,linux/arm64 | ||
platforms: linux/amd64 | ||
# ensure latest base image is used | ||
pull: true | ||
push: ${{ github.repository == 'KNMI/adaguc-server' }} | ||
tags: ${{ steps.meta.outputs.tags }} | ||
tags: ${{ steps.meta.outputs.tags }}-20240911T1446 | ||
labels: ${{ steps.meta.outputs.labels }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to discuss if it would be a good solution to start this executable once in the python code. The reasoning is that the python code has logic to calculate the environment variables like ADAGUC_ONLINERESOURCE and others.