Compare commits
2 Commits
be7017736d
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 29fb48906a | |||
| 5b31a1b953 |
@@ -14,19 +14,29 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
REGISTRY_ADDRESS: registry.ma-al.pl
|
REGISTRY_ADDRESS: registry.ma-al.pl
|
||||||
DOCKER_APP_NAME: cl-project
|
DOCKER_APP_NAME: cl-project
|
||||||
MAAL_REGISTRY_USER: ${{ secret.MAAL_REGISTRY_USER }}
|
MAAL_REGISTRY_USER: ${{ secrets.MAAL_REGISTRY_USER }}
|
||||||
MAAL_REGISTRY_PASSWORD: ${{ secret.MAAL_REGISTRY_PASSWORD }}
|
MAAL_REGISTRY_PASSWORD: ${{ secrets.MAAL_REGISTRY_PASSWORD }}
|
||||||
MAAL_SSH_PRIVATE_KEY: ${{ secret.MAAL_SSH_PRIVATE_KEY }}
|
MAAL_SSH_PRIVATE_KEY: ${{ secrets.MAAL_SSH_PRIVATE_KEY }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Pull Git Repo with Code
|
- name: Pull Git Repo with Code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Generate version
|
- name: Generate version
|
||||||
run: echo "VERSION=$(date +%Y%d%m_%H%M)" >> $GITHUB_ENV
|
run: |
|
||||||
|
VERSION=$(date +%Y%d%m_%H%M)
|
||||||
|
GIT_SHA=$(git rev-parse --short HEAD)
|
||||||
|
|
||||||
|
echo "VERSION=$VERSION" >> $GITHUB_ENV
|
||||||
|
echo "GIT_SHA=$GIT_SHA" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
echo "Version: $VERSION Commit:$GIT_SHA" > public/VERSION
|
||||||
|
|
||||||
- name: Login to registry
|
- name: Login to registry
|
||||||
run: echo "${{ env.MAAL_REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY_ADDRESS }} -u ${{ env.MAAL_REGISTRY_USER }} --password-stdin
|
run: |
|
||||||
|
echo "${{ secrets.MAAL_REGISTRY_PASSWORD }}" | docker login registry.ma-al.pl \
|
||||||
|
-u "${{ secrets.MAAL_REGISTRY_USER }}" \
|
||||||
|
--password-stdin
|
||||||
|
|
||||||
- name: Build application image
|
- name: Build application image
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -71,6 +71,15 @@
|
|||||||
<a href="/api-docs" target="_blank" class="btn btn-outline-secondary btn-sm">View docs</a>
|
<a href="/api-docs" target="_blank" class="btn btn-outline-secondary btn-sm">View docs</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Version info -->
|
||||||
|
<div class="card mt-3">
|
||||||
|
<div class="card-body">
|
||||||
|
<div id="versionInfo" class="text-center text-muted small">
|
||||||
|
Loading version...
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@@ -87,6 +96,24 @@
|
|||||||
location.reload();
|
location.reload();
|
||||||
});
|
});
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
// Fetch and display version
|
||||||
|
fetch('/VERSION')
|
||||||
|
.then(response => {
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Network response was not ok');
|
||||||
|
}
|
||||||
|
return response.text();
|
||||||
|
})
|
||||||
|
.then(versionText => {
|
||||||
|
const versionInfo = document.getElementById('versionInfo');
|
||||||
|
versionInfo.textContent = versionText.trim() || 'Version not available';
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
console.error('Could not load version:', error);
|
||||||
|
const versionInfo = document.getElementById('versionInfo');
|
||||||
|
versionInfo.textContent = 'Version not available';
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Reference in New Issue
Block a user