diff --git a/.gitea/workflows/build-and-push.yml b/.gitea/workflows/build-and-push.yml index faae195..0567ce3 100644 --- a/.gitea/workflows/build-and-push.yml +++ b/.gitea/workflows/build-and-push.yml @@ -12,8 +12,6 @@ env: REGISTRY: privaterepo.sitaru.org BACKEND_IMAGE_NAME: ${{ gitea.repository }}-backend FRONTEND_IMAGE_NAME: ${{ gitea.repository }}-frontend - INTEGRATOR_IMAGE_NAME: ${{ gitea.repository }}-integrator - KESTRA_INIT_IMAGE_NAME: ${{ gitea.repository }}-kestra-init PIPELINE_IMAGE_NAME: ${{ gitea.repository }}-pipeline jobs: @@ -112,94 +110,6 @@ jobs: # cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE_NAME }}:buildcache # cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE_NAME }}:buildcache,mode=max - build-integrator: - name: Build Integrator - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - with: - buildkitd-config-inline: | - [registry."docker.io"] - mirrors = ["10.0.1.224:6000"] - [registry."10.0.1.224:6000"] - http = true - insecure = true - - - name: Log in to Gitea Container Registry - uses: docker/login-action@v3 - with: - registry: ${{ env.REGISTRY }} - username: ${{ gitea.actor }} - password: ${{ secrets.REGISTRY_TOKEN }} - - - name: Extract metadata for Integrator Docker image - id: meta-integrator - uses: docker/metadata-action@v5 - with: - images: ${{ env.REGISTRY }}/${{ env.INTEGRATOR_IMAGE_NAME }} - tags: | - type=ref,event=branch - type=ref,event=pr - type=sha,prefix=integrator- - type=raw,value=latest,enable=${{ gitea.ref == 'refs/heads/main' }} - - - name: Build and push Integrator Docker image - uses: docker/build-push-action@v5 - with: - context: ./integrator - file: ./integrator/Dockerfile - push: ${{ gitea.event_name != 'pull_request' }} - tags: ${{ steps.meta-integrator.outputs.tags }} - labels: ${{ steps.meta-integrator.outputs.labels }} - - build-kestra-init: - name: Build Kestra Init - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - with: - buildkitd-config-inline: | - [registry."docker.io"] - mirrors = ["10.0.1.224:6000"] - [registry."10.0.1.224:6000"] - http = true - insecure = true - - - name: Log in to Gitea Container Registry - uses: docker/login-action@v3 - with: - registry: ${{ env.REGISTRY }} - username: ${{ gitea.actor }} - password: ${{ secrets.REGISTRY_TOKEN }} - - - name: Extract metadata for Kestra Init Docker image - id: meta-kestra-init - uses: docker/metadata-action@v5 - with: - images: ${{ env.REGISTRY }}/${{ env.KESTRA_INIT_IMAGE_NAME }} - tags: | - type=ref,event=branch - type=ref,event=pr - type=sha,prefix=kestra-init- - type=raw,value=latest,enable=${{ gitea.ref == 'refs/heads/main' }} - - - name: Build and push Kestra Init Docker image - uses: docker/build-push-action@v5 - with: - context: ./integrator - file: ./integrator/Dockerfile.init - push: ${{ gitea.event_name != 'pull_request' }} - tags: ${{ steps.meta-kestra-init.outputs.tags }} - labels: ${{ steps.meta-kestra-init.outputs.labels }} - build-pipeline: name: Build Pipeline (Meltano + dbt + Airflow) runs-on: ubuntu-latest @@ -249,7 +159,7 @@ jobs: trigger-deployment: name: Trigger Portainer Update runs-on: ubuntu-latest - needs: [build-backend, build-frontend, build-integrator, build-kestra-init, build-pipeline] + needs: [build-backend, build-frontend, build-pipeline] if: gitea.event_name != 'pull_request' steps: - name: Trigger Portainer stack update diff --git a/nextjs-app/components/SchoolDetailView.tsx b/nextjs-app/components/SchoolDetailView.tsx index cd5dbfe..7021297 100644 --- a/nextjs-app/components/SchoolDetailView.tsx +++ b/nextjs-app/components/SchoolDetailView.tsx @@ -154,7 +154,7 @@ export function SchoolDetailView({ )} {schoolInfo.website && ( - + School website ↗