diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf8289e..d3a91d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,8 @@ jobs: docker-fe-build: runs-on: ubuntu-latest - + outputs: + image_tag: ${{ steps.get_image_tag.outputs.image_tag }} steps: - uses: actions/checkout@v4 - uses: docker/setup-buildx-action@v3 @@ -48,6 +49,12 @@ jobs: run: doctl registry login --expiry-seconds 1200 - name: Log in to GitHub Container Registry run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin + - id: get_image_tag + run: | + echo "GITHUB_SHA_SHORT=$(echo ${GITHUB_SHA::8})" >> $GITHUB_ENV + echo "registry.digitalocean.com/kemkas/kemkas-fe:${GITHUB_SHA::8}" + echo "ghcr.io/${{ github.repository_owner }}/kemkas-frontend:${GITHUB_SHA::8}" + echo "image_tag=registry.digitalocean.com/kemkas/kemkas-fe:${GITHUB_SHA::8}" >> $GITHUB_OUTPUT - uses: docker/build-push-action@v5 with: context: ./frontend/ @@ -56,12 +63,30 @@ jobs: cache-to: type=gha,mode=max push: false load: true - tags: kemkas/kemkas-fe:edge - - name: Tag container image - run: | - docker tag kemkas/kemkas-fe:edge registry.digitalocean.com/kemkas/kemkas-fe:${GITHUB_SHA::8} - docker tag kemkas/kemkas-fe:edge ghcr.io/${{ github.repository_owner }}/kemkas-frontend:${GITHUB_SHA::8} + tags: | + registry.digitalocean.com/kemkas/kemkas-fe:${{ env.GITHUB_SHA_SHORT }} + ghcr.io/${{ github.repository_owner }}/kemkas-frontend:${{ env.GITHUB_SHA_SHORT }} - name: Push image to Container Registry run: | docker push registry.digitalocean.com/kemkas/kemkas-fe:${GITHUB_SHA::8} docker push ghcr.io/${{ github.repository_owner }}/kemkas-frontend:${GITHUB_SHA::8} + + deploy-to-beta: + runs-on: ubuntu-latest + needs: + - docker-fe-build + steps: + - uses: actions/checkout@v4 + with: + repository: ${{ github.repository_owner }}/kemkas-deployment + refs: refs/heads/main + ssh-key: ${{ secrets.DEPLOYMENT_REPO_DEPLOY_KEY }} + - uses: mikefarah/yq@v4 + with: + cmd: yq -i '.spec.template.spec.containers[0].image = "${{ needs.docker-fe-build.outputs.image_tag }}"' ./dkemkas-beta/kemkas-fe-deployment.yaml + - run: | + cd ./deployment-repo + git config --add user.email "beta-fe-deployment-bot@kemkas.hu" + git config --add user.name "Deployment Bot Beta FE" + git commit -a -m "deploy ${{ needs.docker-fe-build.outputs.image_tag }}" + git push \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index b58b603..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/.idea/.idea.Kemkas/.idea/.gitignore b/.idea/.idea.Kemkas/.idea/.gitignore deleted file mode 100644 index e562b88..0000000 --- a/.idea/.idea.Kemkas/.idea/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Rider ignored files -/projectSettingsUpdater.xml -/modules.xml -/contentModel.xml -/.idea.Kemkas.iml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/.idea.Kemkas/.idea/.name b/.idea/.idea.Kemkas/.idea/.name deleted file mode 100644 index a3fd214..0000000 --- a/.idea/.idea.Kemkas/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -Kemkas \ No newline at end of file diff --git a/.idea/.idea.Kemkas/.idea/dataSources.xml b/.idea/.idea.Kemkas/.idea/dataSources.xml deleted file mode 100644 index 79030f5..0000000 --- a/.idea/.idea.Kemkas/.idea/dataSources.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - postgresql - true - true - org.postgresql.Driver - jdbc:postgresql://127.0.0.1:5432/?password=kemkas-dev42&user=kemkas - $ProjectFileDir$ - - - \ No newline at end of file diff --git a/.idea/.idea.Kemkas/.idea/efCoreCommonOptions.xml b/.idea/.idea.Kemkas/.idea/efCoreCommonOptions.xml deleted file mode 100644 index 1f2a117..0000000 --- a/.idea/.idea.Kemkas/.idea/efCoreCommonOptions.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/.idea.Kemkas/.idea/efCoreDialogsState.xml b/.idea/.idea.Kemkas/.idea/efCoreDialogsState.xml deleted file mode 100644 index 859685e..0000000 --- a/.idea/.idea.Kemkas/.idea/efCoreDialogsState.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/.idea.Kemkas/.idea/encodings.xml b/.idea/.idea.Kemkas/.idea/encodings.xml deleted file mode 100644 index df87cf9..0000000 --- a/.idea/.idea.Kemkas/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.Kemkas/.idea/indexLayout.xml b/.idea/.idea.Kemkas/.idea/indexLayout.xml deleted file mode 100644 index 7b08163..0000000 --- a/.idea/.idea.Kemkas/.idea/indexLayout.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/.idea.Kemkas/.idea/jsLibraryMappings.xml b/.idea/.idea.Kemkas/.idea/jsLibraryMappings.xml deleted file mode 100644 index d23208f..0000000 --- a/.idea/.idea.Kemkas/.idea/jsLibraryMappings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/.idea.Kemkas/.idea/vcs.xml b/.idea/.idea.Kemkas/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/.idea.Kemkas/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/.idea.kemkas.dir/.idea/.gitignore b/.idea/.idea.kemkas.dir/.idea/.gitignore deleted file mode 100644 index d6a425b..0000000 --- a/.idea/.idea.kemkas.dir/.idea/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Rider ignored files -/modules.xml -/contentModel.xml -/.idea.kemkas.iml -/projectSettingsUpdater.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/.idea.kemkas.dir/.idea/encodings.xml b/.idea/.idea.kemkas.dir/.idea/encodings.xml deleted file mode 100644 index df87cf9..0000000 --- a/.idea/.idea.kemkas.dir/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.kemkas.dir/.idea/indexLayout.xml b/.idea/.idea.kemkas.dir/.idea/indexLayout.xml deleted file mode 100644 index 7b08163..0000000 --- a/.idea/.idea.kemkas.dir/.idea/indexLayout.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/.idea.kemkas.dir/.idea/jsLibraryMappings.xml b/.idea/.idea.kemkas.dir/.idea/jsLibraryMappings.xml deleted file mode 100644 index d23208f..0000000 --- a/.idea/.idea.kemkas.dir/.idea/jsLibraryMappings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/.idea.kemkas.dir/.idea/vcs.xml b/.idea/.idea.kemkas.dir/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/.idea.kemkas.dir/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index f24e134..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/kemkas.iml b/.idea/kemkas.iml index 2bfa945..24643cc 100644 --- a/.idea/kemkas.iml +++ b/.idea/kemkas.iml @@ -3,7 +3,6 @@ - diff --git a/.idea/modules.xml b/.idea/modules.xml index 2ea3ff2..d288493 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml deleted file mode 100644 index 31b6f04..0000000 --- a/.idea/watcherTasks.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..c5756a1 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1710663795416 + + + + + + \ No newline at end of file diff --git a/Kemkas.sln b/Kemkas.sln deleted file mode 100644 index b2a0f31..0000000 --- a/Kemkas.sln +++ /dev/null @@ -1,27 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kemkas.Web", "Kemkas.Web\Kemkas.Web.csproj", "{ABAEE4DC-1A07-40AE-A2B6-4D3755A6C1E8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "General", "General", "{5D06CE1E-DD86-41C0-A1BF-53162BD027AA}" - ProjectSection(SolutionItems) = preProject - README.md = README.md - TODO.md = TODO.md - .gitignore = .gitignore - .dockerignore = .dockerignore - .tool-versions = .tool-versions - .github\dependabot.yml = .github\dependabot.yml - .github\workflows\ci.yml = .github\workflows\ci.yml - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {ABAEE4DC-1A07-40AE-A2B6-4D3755A6C1E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABAEE4DC-1A07-40AE-A2B6-4D3755A6C1E8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABAEE4DC-1A07-40AE-A2B6-4D3755A6C1E8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABAEE4DC-1A07-40AE-A2B6-4D3755A6C1E8}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/Kemkas.sln.DotSettings b/Kemkas.sln.DotSettings deleted file mode 100644 index f2bbb63..0000000 --- a/Kemkas.sln.DotSettings +++ /dev/null @@ -1,3 +0,0 @@ - - True - True \ No newline at end of file