From 98f5a7dbbc37efc5d8abce1bbc6e8faf6954115b Mon Sep 17 00:00:00 2001 From: nichlaes Date: Thu, 19 Sep 2024 15:53:27 +0200 Subject: [PATCH 1/5] only publish docker image if version is not yet published --- .github/workflows/docker.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7861d6644..cfb285a3f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -6,14 +6,14 @@ on: registry: required: false type: string - default: 'ghcr.io' + default: "ghcr.io" image-name: required: true type: string version: required: true type: string - default: 'latest' + default: "latest" dockerfile: required: true type: string @@ -23,8 +23,8 @@ jobs: runs-on: ubuntu-latest permissions: - contents: read - packages: write + contents: read + packages: write steps: - name: Checkout Repository @@ -37,7 +37,19 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Check if version exists + id: check_version + run: | + if docker manifest inspect ${{ inputs.registry }}/${{ inputs.image-name }}:${{ inputs.version }} > /dev/null 2>&1; then + echo "Version ${{ inputs.version }} already exists." + echo "exists=true" >> $GITHUB_ENV + else + echo "Version ${{ inputs.version }} does not exist." + echo "exists=false" >> $GITHUB_ENV + fi + - name: Build and push Docker image + if: env.exists == 'false' uses: docker/build-push-action@v5 with: context: . From 104d96b6fc36991872bba8e75778046c6eb4065b Mon Sep 17 00:00:00 2001 From: nichlaes Date: Fri, 20 Sep 2024 11:07:38 +0200 Subject: [PATCH 2/5] updated docs --- servers/lib/DEVELOPER.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/servers/lib/DEVELOPER.md b/servers/lib/DEVELOPER.md index 497eeee53..c4af1c822 100644 --- a/servers/lib/DEVELOPER.md +++ b/servers/lib/DEVELOPER.md @@ -54,10 +54,10 @@ it is required to manually run `yarn test:http` with `LOCAL_PATH` both as an absolute path and local path. For example, the manual tests need to be done with the following `LOCAL_PATH` values. -| OS | Absolute Path | Relative Path | -| ------- | ----------------------------- | ------------- | -| Windows | C:\DTaaS\files | ..\..\files | -| Linux | /Users//DTaaS/files | ../../files | +| OS | Absolute Path | Relative Path | +| ------- | ------------------------------- | ------------- | +| Windows | C:\DTaaS\files | ..\..\files | +| Linux | /Users/\/DTaaS/files | ../../files | ### PM2 From 6678fc864033f86bd7be645c65ade570b5157b23 Mon Sep 17 00:00:00 2001 From: nichlaes Date: Fri, 20 Sep 2024 11:08:09 +0200 Subject: [PATCH 3/5] adds port to dev env --- client/config/dev.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/config/dev.js b/client/config/dev.js index e8b36f844..7922fdec4 100644 --- a/client/config/dev.js +++ b/client/config/dev.js @@ -1,7 +1,7 @@ if (typeof window !== 'undefined') { window.env = { REACT_APP_ENVIRONMENT: 'dev', - REACT_APP_URL: 'http://localhost/', + REACT_APP_URL: 'http://localhost:4000/', REACT_APP_URL_BASENAME: '', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', @@ -11,9 +11,9 @@ if (typeof window !== 'undefined') { REACT_APP_WORKBENCHLINK_JUPYTERNOTEBOOK: '', REACT_APP_CLIENT_ID: '1be55736756190b3ace4c2c4fb19bde386d1dcc748d20b47ea8cfb5935b8446c', - REACT_APP_AUTH_AUTHORITY: 'https://gitlab.foo.com/', - REACT_APP_REDIRECT_URI: 'http://localhost/Library', - REACT_APP_LOGOUT_REDIRECT_URI: 'http://localhost/', + REACT_APP_AUTH_AUTHORITY: 'https://gitlab.com/', + REACT_APP_REDIRECT_URI: 'http://localhost:4000/Library', + REACT_APP_LOGOUT_REDIRECT_URI: 'http://localhost:4000/', REACT_APP_GITLAB_SCOPES: 'openid profile read_user read_repository api', }; -}; +}; \ No newline at end of file From 0229807989827e48b74cc6051aab9eec7334d660 Mon Sep 17 00:00:00 2001 From: nichlaes Date: Mon, 23 Sep 2024 12:44:49 +0200 Subject: [PATCH 4/5] Revert "updated docs" This reverts commit 104d96b6fc36991872bba8e75778046c6eb4065b. --- servers/lib/DEVELOPER.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/servers/lib/DEVELOPER.md b/servers/lib/DEVELOPER.md index c4af1c822..497eeee53 100644 --- a/servers/lib/DEVELOPER.md +++ b/servers/lib/DEVELOPER.md @@ -54,10 +54,10 @@ it is required to manually run `yarn test:http` with `LOCAL_PATH` both as an absolute path and local path. For example, the manual tests need to be done with the following `LOCAL_PATH` values. -| OS | Absolute Path | Relative Path | -| ------- | ------------------------------- | ------------- | -| Windows | C:\DTaaS\files | ..\..\files | -| Linux | /Users/\/DTaaS/files | ../../files | +| OS | Absolute Path | Relative Path | +| ------- | ----------------------------- | ------------- | +| Windows | C:\DTaaS\files | ..\..\files | +| Linux | /Users//DTaaS/files | ../../files | ### PM2 From 35de4313d75018f97f2ba44a313a652a8c785ddb Mon Sep 17 00:00:00 2001 From: nichlaes Date: Mon, 23 Sep 2024 12:44:56 +0200 Subject: [PATCH 5/5] Revert "adds port to dev env" This reverts commit 6678fc864033f86bd7be645c65ade570b5157b23. --- client/config/dev.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/config/dev.js b/client/config/dev.js index 7922fdec4..e8b36f844 100644 --- a/client/config/dev.js +++ b/client/config/dev.js @@ -1,7 +1,7 @@ if (typeof window !== 'undefined') { window.env = { REACT_APP_ENVIRONMENT: 'dev', - REACT_APP_URL: 'http://localhost:4000/', + REACT_APP_URL: 'http://localhost/', REACT_APP_URL_BASENAME: '', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', @@ -11,9 +11,9 @@ if (typeof window !== 'undefined') { REACT_APP_WORKBENCHLINK_JUPYTERNOTEBOOK: '', REACT_APP_CLIENT_ID: '1be55736756190b3ace4c2c4fb19bde386d1dcc748d20b47ea8cfb5935b8446c', - REACT_APP_AUTH_AUTHORITY: 'https://gitlab.com/', - REACT_APP_REDIRECT_URI: 'http://localhost:4000/Library', - REACT_APP_LOGOUT_REDIRECT_URI: 'http://localhost:4000/', + REACT_APP_AUTH_AUTHORITY: 'https://gitlab.foo.com/', + REACT_APP_REDIRECT_URI: 'http://localhost/Library', + REACT_APP_LOGOUT_REDIRECT_URI: 'http://localhost/', REACT_APP_GITLAB_SCOPES: 'openid profile read_user read_repository api', }; -}; \ No newline at end of file +};