Merge pull request #3 from it-at-m/ImageImprovements

Image improvements

.github/workflows/build.yaml

@@ -29,7 +29,6 @@ jobs:
       - name: Build image
         uses: docker/build-push-action@v5
         with:
-#          context: ./pentaho-carte
           push: false
           # tags: itatm/pentaho-carte:${{ env.GITHUB_REF_NAME_SLUG }}
           tags: itatm/pentaho-carte:latest

.github/workflows/release-image.yaml

@@ -3,13 +3,13 @@ name: Create and publish Docker image
 on:
   workflow_dispatch:
     inputs:
-      branch:
-        description: "Branch to release from ?"
-        required: true
-        default: "main"
       release-tag:
         description: "Release tag ?"
         required: true
+      do_release:
+        description: "Create Github Release ? (true/false)"
+        required: true
+        default: "false"
 
 env:
   REGISTRY: ghcr.io
@@ -60,11 +60,12 @@ jobs:
 #          subject-digest: ${{ steps.push.outputs.digest }}
 #          push-to-registry: true
 
-      - name: Create GitHub Release
-        id: create_release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ github.event.inputs.release-tag }}
-          draft: false
-          prerelease: false
-          generate_release_notes: true
+#      - name: Create GitHub Release
+#        id: create_release
+#        if: inputs.do_release == 'true'
+#        uses: softprops/action-gh-release@v2
+#        with:
+#          tag_name: ${{ github.event.inputs.release-tag }}
+#          draft: false
+#          prerelease: false
+#          generate_release_notes: true

.gitignore

@@ -0,0 +1,19 @@
+# Covers Eclipse specific:
+.settings/
+.classpath
+.project
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+.idea
+*.iml
+
+# Covers Netbeans:
+**/nbproject/private/
+**/nbproject/Makefile-*.mk
+**/nbproject/Package-*.bash
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+

Dockerfile

@@ -14,11 +14,12 @@
 
       # Pentaho Directory
       RUN mkdir ${PENTAHO_INSTALL}
-      RUN chmod 775 ${PENTAHO_INSTALL}
+
+      WORKDIR ${PENTAHO_INSTALL}
 
       # Download PDI and extract it
       RUN curl ${PENTAHO_URL} -o $HOME/pdi-ce-${PDI_VERSION}.zip
-      RUN cd $PENTAHO_INSTALL && jar -xvf $HOME/pdi-ce-${PDI_VERSION}.zip
+      RUN jar -xvf $HOME/pdi-ce-${PDI_VERSION}.zip
 
       ##################################################################################################
       # Second layer: Here is where we create the final image                                          #
@@ -36,21 +37,20 @@
 
       # Environment settings
       ENV PENTAHO_JAVA_HOME=$JAVA_HOME
-      ENV PENTAHO_HOME=$HOME/pentaho
       ENV CARTE_PORT=8080
-      ENV KETTLE_HOME=${PENTAHO_HOME}/data-integration
+      ENV KETTLE_HOME=${HOME}/data-integration
       ENV PATH=${KETTLE_HOME}:$PATH
 
-      # Create PENTAHO_HOME directory
-      RUN mkdir ${PENTAHO_HOME}
-      RUN chmod 775 ${PENTAHO_HOME}
+      # Create PENTAHO_HOME directory and make it writable
+      RUN mkdir ${KETTLE_HOME} && chmod 775 ${KETTLE_HOME}
+
+      WORKDIR ${KETTLE_HOME}
 
       # Copy Pentaho PDI from layer install_unpack to this layer
-      COPY --from=install_unpack ${PENTAHO_INSTALL}/data-integration/ ${KETTLE_HOME}/
+      COPY --from=install_unpack --chmod=775 ${PENTAHO_INSTALL}/data-integration/ ${KETTLE_HOME}/
 
-      RUN chmod 775 ${KETTLE_HOME}
+      # Make PDI runnable
       RUN chmod 755 ${KETTLE_HOME}/*.sh
 
       # Start Carte Server
-      RUN cd ${KETTLE_HOME}
       CMD ${KETTLE_HOME}/carte.sh ${HOSTNAME} ${CARTE_PORT}

ReadMe.md

@@ -31,9 +31,7 @@ Use Pentaho Carte Server's  [default user and password](https://pentaho-public.a
 
 ### Deploying on Kubernetes using a Helm chart
 
-We will provide a Helm Chart for *pentaho-carte* soon under [provided Helm chart][helm-chart-github].
-
-<!-- If you want to deploy pentaho-carte on a Kubernetes cluster, you can use the [provided Helm chart][helm-chart-github].-->
+If you want to deploy pentaho-carte on a Kubernetes cluster, you can use the [provided Helm chart][helm-chart-github].
 
 ### Configuration