Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2781ab1
refactor: refine verification status badge rendering
PouyaMohseni Dec 31, 2025
a57eb8a
fix: prevent the source from overflow
PouyaMohseni Apr 5, 2026
de5fa0d
fix: try to assign a new instrument name when the main name/language …
PouyaMohseni Apr 5, 2026
268b27a
Merge pull request #543 from DDMAL/remove-name
PouyaMohseni Apr 10, 2026
ff120d6
Merge pull request #542 from DDMAL/expand-source
PouyaMohseni Apr 10, 2026
fb88525
fix: add a remove btn when image is added in the create page
PouyaMohseni Apr 10, 2026
33614a9
feat: hyperlink should open in a new tab
PouyaMohseni Apr 24, 2026
11f7316
feat: link HBS flowcharts to Create Instrument page
PouyaMohseni Apr 24, 2026
0d184a6
Merge pull request #545 from DDMAL/hbs-link
PouyaMohseni Apr 25, 2026
511d42e
feat: link HBS flowcharts to Create Instrument page
PouyaMohseni Apr 24, 2026
a3ff386
fix: Prevent overflow on md screens
PouyaMohseni May 1, 2026
625d6f4
Merge pull request #544 from DDMAL/file-remove
PouyaMohseni May 1, 2026
138da62
Merge pull request #481 from DDMAL/multiple-clicks
PouyaMohseni May 1, 2026
cb960aa
Merge pull request #546 from DDMAL/md-add-name
PouyaMohseni May 19, 2026
31b234f
Merge pull request #484 from DDMAL/fix-no-status
PouyaMohseni May 19, 2026
03a3ede
Feat: Add postgres manifests
amirsadraabdollahi May 26, 2026
1c5bc9b
Feat: Add solr k8s manifests
amirsadraabdollahi May 26, 2026
232795d
Feat: Add app and nginx k8s manifests
amirsadraabdollahi May 26, 2026
51482b7
Fix: url of images
amirsadraabdollahi May 26, 2026
5f0922f
Fix: build-and-push image url
amirsadraabdollahi May 26, 2026
2a5c4e4
Fix: add local host to allowed hosts
amirsadraabdollahi May 26, 2026
ddc8920
Feat: Add django-extension and ipython
amirsadraabdollahi May 26, 2026
c2d5b7b
Add access-log in gunicorn
amirsadraabdollahi May 26, 2026
79025ca
Feat: add deploy job to build-push-deploy workflow
amirsadraabdollahi May 26, 2026
3cedf51
Feat: Add staging k8s manifests
amirsadraabdollahi May 27, 2026
ada4dcf
Fix: postgres staging database
amirsadraabdollahi May 27, 2026
a8acdf4
Fix: use env var for host_app in nginx
amirsadraabdollahi May 27, 2026
0c6a054
Delete previous docker-compose for deploying
amirsadraabdollahi May 27, 2026
c439320
Merge pull request #547 from DDMAL/k8s-migration
amirsadraabdollahi May 27, 2026
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
110 changes: 110 additions & 0 deletions .github/workflows/build-push-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
name: Build, Push, and Deploy

on:
push:
release:
types: [published]

permissions:
contents: read
packages: write

jobs:
build-and-push:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Sanitize branch name
id: branch
run: echo "name=$(echo '${{ github.ref_name }}' | sed 's/[^a-zA-Z0-9._-]/-/g')" >> $GITHUB_OUTPUT

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker metadata
id: meta
uses: docker/metadata-action@v5
with:
images: ghcr.io/ddmal/umil

- name: Build and push app
uses: docker/build-push-action@v5
with:
context: .
file: ./web-app/Dockerfile
target: prod
push: true
tags: |
ghcr.io/ddmal/umil-app:${{ steps.branch.outputs.name }}-latest
ghcr.io/ddmal/umil-app:${{ github.sha }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha,scope=app
cache-to: type=gha,mode=max,scope=app

- name: Build and push nginx
uses: docker/build-push-action@v5
with:
context: .
file: ./nginx/Dockerfile.prod
push: true
tags: |
ghcr.io/ddmal/umil-nginx:${{ steps.branch.outputs.name }}-latest
ghcr.io/ddmal/umil-nginx:${{ github.sha }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha,scope=nginx
cache-to: type=gha,mode=max,scope=nginx

deploy-staging:
needs: build-and-push
runs-on: ubuntu-latest
if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
steps:
- name: Set up kubectl
uses: azure/setup-kubectl@v4

- name: Configure kubeconfig
run: |
mkdir -p ~/.kube
echo "${{ secrets.KUBECONFIG }}" > ~/.kube/config
chmod 600 ~/.kube/config

- name: Deploy to staging
run: |
kubectl set image deployment/umil-app-staging \
collectstatic=ghcr.io/ddmal/umil-app:${{ github.sha }} \
app=ghcr.io/ddmal/umil-app:${{ github.sha }} \
nginx=ghcr.io/ddmal/umil-nginx:${{ github.sha }} \
-n umil
kubectl rollout status deployment/umil-app-staging -n umil --timeout=300s

deploy-production:
needs: build-and-push
runs-on: ubuntu-latest
if: github.event_name == 'release' && github.event.action == 'published'
steps:
- name: Set up kubectl
uses: azure/setup-kubectl@v4

- name: Configure kubeconfig
run: |
mkdir -p ~/.kube
echo "${{ secrets.KUBECONFIG }}" > ~/.kube/config
chmod 600 ~/.kube/config

- name: Deploy to Kubernetes
run: |
kubectl set image deployment/umil-app \
collectstatic=ghcr.io/ddmal/umil-app:${{ github.sha }} \
app=ghcr.io/ddmal/umil-app:${{ github.sha }} \
nginx=ghcr.io/ddmal/umil-nginx:${{ github.sha }} \
-n umil
kubectl rollout status deployment/umil-app -n umil --timeout=300s
103 changes: 0 additions & 103 deletions .github/workflows/cd_prod.yml

This file was deleted.

47 changes: 0 additions & 47 deletions .github/workflows/cd_stage.yml

This file was deleted.

35 changes: 0 additions & 35 deletions .github/workflows/ci_build_deployment.yml

This file was deleted.

76 changes: 0 additions & 76 deletions docker-compose-deployment.yml

This file was deleted.

1 change: 1 addition & 0 deletions docker-compose-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ services:
restart: unless-stopped
environment:
- HOST_NAME=${HOST_NAME}
- APP_HOST=vim-app
ports:
- "8000:80"
volumes:
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ services:
restart: unless-stopped
environment:
- HOST_NAME=${HOST_NAME}
- APP_HOST=vim-app
ports:
- "8000:80"
volumes:
Expand Down
Loading
Loading