.gitea/workflows/release.yml aktualisiert

.config/config_global.php

@@ -33,6 +33,7 @@ if ($environment === false)
 }
 
 define('ENVIRONMENT', $environment);
+define('SCHEME', 'https');
 
 if (isset($_SERVER['HTTPS']))
 {

.config/config_svjf.php

@@ -11,7 +11,7 @@ if (ENVIRONMENT === 'local')
 }
 elseif (ENVIRONMENT === 'production')
 {
-	$svjf['editorUrl'] = $vC['portal']['arrHost']['scheme'] . '://rist-editors.ri-st.de/';
+	$svjf['editorUrl'] = $vC['portal']['arrHost']['scheme'] . '://editors.ri-st.de/';
 	$svjf['editorVersion'] = '1.0.5';
 }
 $svjf['webserviceUrl'] = $vC['portal']['hostUrl'] . '/webservices/remote_data.php';

.drone.yml

@@ -1,19 +0,0 @@
-kind: pipeline
-name: default
-
-steps:
-  - name: build container
-    image: plugins/docker
-    settings:
-      dockerfile: Dockerfile
-      username:
-        from_secret: registry-username
-      password:
-        from_secret: registry-password
-      registry: https://cs-registry.ddnss.de
-      repo: cs-registry.ddnss.de/${DRONE_REPO_OWNER}/website
-      dry_run: false
-      purge: true
-      insecure: false
-      tags:
-        - ${DRONE_TAG}

.gitea/workflows/release.yml

@@ -0,0 +1,78 @@
+name: Build svj-website image
+
+on:
+  push:
+    branches: [ master ]
+  schedule:
+    # Run every Sunday at midnight
+    - cron: '0 0 * * 0'
+
+env:
+  IMAGE: /svj/website
+
+jobs:
+  Build-and-release-image:
+
+    runs-on: ubuntu-latest
+
+    container:
+      image: catthehacker/ubuntu:act-latest
+
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ vars.DOCKERHUB_USER }}
+          password: ${{ vars.DOCKERHUB_TOKEN }}
+
+      - name: Log into CS registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.CS_REGISTRY_URL }}
+          username: ${{ vars.CS_REGISTRY_USER }}
+          password: ${{ vars.CS_REGISTRY_PASS }}
+
+      - name: Log into local registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.LOCAL_REGISTRY_URL }}
+          username: ${{ vars.LOCAL_REGISTRY_USER }}
+          password: ${{ vars.LOCAL_REGISTRY_PASS }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ secrets.REGISTRY_URL }}${{ env.IMAGE }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        env:
+          ACTIONS_RUNTIME_TOKEN: ''
+        with:
+          tags: ${{ vars.LOCAL_REGISTRY_URL }}${{ env.IMAGE }}:latest
+          push: true
+          
+      - name: Scan image
+        uses: anchore/scan-action@v6
+        id: scan
+        with:
+          image: ${{ vars.LOCAL_REGISTRY_URL }}${{ env.IMAGE }}:latest
+          fail-build: false
+          output-format: table
+          severity-cutoff: critical
+          registry-username: ${{ vars.LOCAL_REGISTRY_USER }}
+          registry-password: ${{ vars.LOCAL_REGISTRY_PASS }}
+          grype-version: 'v0.90.0'
+      
+      - name: Inspect file
+        run: cat ${{ steps.scan.outputs.table }}
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: scan-result
+          path: ${{ steps.scan.outputs.table }}

.gitignore

@@ -0,0 +1,2 @@
+/media/
+/.idea

Dockerfile

@@ -1,5 +1,17 @@
-FROM php:7.2-apache-stretch
+FROM php:7.2-apache-buster
+RUN docker-php-ext-install mysqli
+
+RUN apt-get update -y && apt-get install -y libwebp-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libfreetype6-dev zlib1g-dev libzip-dev
+
+RUN docker-php-ext-install zip
+
+RUN docker-php-ext-configure gd --with-gd --with-webp-dir --with-jpeg-dir \
+    --with-png-dir --with-zlib-dir --with-xpm-dir --with-freetype-dir
+
+RUN docker-php-ext-install gd
 
 VOLUME /var/www/html/media
 
-COPY . /var/www/html
+COPY . /var/www/html
+
+RUN chown -R www-data:www-data /var/www/html

templates/svjf/tpl_uebersicht_standard.php

@@ -5,6 +5,9 @@ $subline = '';
 $text = '';
 foreach($this->_data as $pagePart)
 {
+	if (!isset($pagePart['type'])) {
+		continue;
+	}
 	switch ( $pagePart['type'])
 	{
 		case 'headline' :

templates/svjf/tpl_widget_fussballde.php

@@ -14,7 +14,7 @@
 ?>
 	<div class="grid_5col"></div>
 	<div id="meinWettbewerb" class="grid_30col"></div>
-	<script type="text/javascript" src="http://www.fussball.de/export.widget.js/-/schluessel/<?php echo $this -> _data[ 'schluessel' ]; ?>"></script>
+	<script type="text/javascript" src="https://www.fussball.de/export.widget.js/-/schluessel/<?php echo $this -> _data[ 'schluessel' ]; ?>"></script>
 	<script type="text/javascript">
 		var wettbewerb1 = new fussballdeAPI();
 		wettbewerb1.setzeWettbewerb('<?php echo $this -> _data[ 'wettbewerb' ]; ?>');