Include templating support (factoriotools#382)

martydingo · Sep 2, 2021 · 89b9851 · 89b9851
1 parent f2a5d6d
commit 89b9851
Show file tree

Hide file tree

Showing 50 changed files with 101 additions and 3,667 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -1,53 +1,19 @@
-name: Docker build & push
+name: Docker build
 
 on:
   pull_request:
-  push:
-    branches: master
-    tags:
-      - '*'
 
 jobs:
-  old-version:
+  build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        version: [ "1.0", "0.17", "0.16", "0.15", "0.14" ]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-      - name: build 
+      - name: Install dependencies
+        run: pip install jinja2
+      - name: build
         env:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          VERSION_SHORT: ${{ matrix.version }}
         run: |
-          ./build.sh ${{ matrix.version }}
-          
-  stable:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: build 
-        env:
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          EXTRA_TAG: stable,latest
-          VERSION_SHORT: "1.1"
-        run: |
-          ./build.sh $VERSION_SHORT
-
-  # experimental:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout
-  #       uses: actions/checkout@v2
-  #     - name: build
-  #       env:
-  #         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-  #         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-  #         EXTRA_TAG: latest
-  #         VERSION_SHORT: "1.2"
-  #       run: |
-  #         ./build.sh $VERSION_SHORT
+          ./build.py
diff --git a/.github/workflows/docker_push.yml b/.github/workflows/docker_push.yml
@@ -0,0 +1,21 @@
+name: Docker build & push
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install dependencies
+        run: pip install jinja2
+      - name: build
+        env:
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        run: |
+          ./build.py --push-tags
diff --git a/0.14/Dockerfile b/0.14/Dockerfile
diff --git a/0.14/build.sh b/0.14/build.sh
diff --git a/0.14/clean.sh b/0.14/clean.sh
diff --git a/0.14/docker-entrypoint.sh b/0.14/docker-entrypoint.sh
diff --git a/0.14/run.sh b/0.14/run.sh
diff --git a/0.15/Dockerfile b/0.15/Dockerfile
diff --git a/0.15/docker-compose.yml b/0.15/docker-compose.yml
diff --git a/0.15/docker-entrypoint.sh b/0.15/docker-entrypoint.sh
diff --git a/0.16/Dockerfile b/0.16/Dockerfile
diff --git a/0.16/docker-compose.yml b/0.16/docker-compose.yml
diff --git a/0.16/files/docker-entrypoint.sh b/0.16/files/docker-entrypoint.sh