fix: prepare for 5.0.10 release

GluuFederation · Mar 16, 2023 · 1ffcbc7 · 1ffcbc7
1 parent 0e7da13
commit 1ffcbc7
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 20 deletions.
diff --git a/.github/workflows/docker_build_image.yml b/.github/workflows/docker_build_image.yml
@@ -88,8 +88,9 @@ jobs:
         if: steps.build_docker_image.outputs.build || github.event_name == 'tags'
         id: prep
         run: |
+          REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')
           MAIN_VERSION=$(python3 -c "from dockerfile_parse import DockerfileParser ; dfparser = DockerfileParser('./docker-${{ matrix.docker-images }}') ; print(dfparser.labels['version'])")
-          DOCKER_IMAGE=gluufederation/${{ matrix.docker-images }}
+          DOCKER_IMAGE=ghcr.io/$REPOSITORY/${{ matrix.docker-images }}
           if [[ ${{ matrix.docker-images }} == "flex-monolith" ]]; then
             DOCKER_IMAGE=gluufederation/monolith
           fi
@@ -162,21 +163,13 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Cache Docker layers
-        if: steps.build_docker_image.outputs.build && steps.prep.outputs.build
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
       - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.MOAUTO_DOCKERHUB_USERNAME }}
-          password: ${{ secrets.MOAUTO_DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: mo-auto
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push
         if: steps.build_docker_image.outputs.build && steps.prep.outputs.build
@@ -197,8 +190,6 @@ jobs:
           platforms: linux/amd64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.prep.outputs.tags }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Image digest
         if: steps.build_docker_image.outputs.build && steps.prep.outputs.build

diff --git a/admin-ui/README.md b/admin-ui/README.md
@@ -25,3 +25,4 @@ npm run start
 Once the project is compiled and started, UI can be accessed at URL: http://localhost:4100
 
 **Note:** Please check this [link](https://raw.githubusercontent.com/0wczar/airframe-react/master/.npmrc) for NPM access token to be added to `NPM_TOKEN` field in `.env` file.
+
diff --git a/casa/README.md b/casa/README.md
@@ -1,3 +1,2 @@
 # casa
 User-facing dashboard for people to manage authentication and authorization data in the Gluu Server.
-
diff --git a/docker-admin-ui/Dockerfile b/docker-admin-ui/Dockerfile
@@ -68,7 +68,7 @@ RUN python3 -m ensurepip \
 # jans-linux-setup sync
 # =====================
 
-ENV JANS_SOURCE_VERSION=cdcefd2ed3fbeef21c7d713453b07994c71393fc
+ENV JANS_SOURCE_VERSION=8beb2b2d0f07e6ca536c2699d229250e498d1c07
 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
 
 # note that as we're pulling from a monorepo (with multiple project in it)

diff --git a/docker-admin-ui/README.md b/docker-admin-ui/README.md
@@ -122,3 +122,4 @@ To add plugins to AdminUI, for example `myplugin.zip`
 
 1. Set the name of the plugin (without the extension name) in environment variable `GLUU_ADMIN_UI_PLUGINS`, for example: `GLUU_ADMIN_UI_PLUGINS=myplugin`.
 2. Mount `myplugin.zip` to `/app/plugins/myplugin.zip` inside the pod/container. Note that if `/app/plugins/myplugin.zip` is not exist, plugin will be ignored.
+
diff --git a/docker-casa/Dockerfile b/docker-casa/Dockerfile
@@ -69,7 +69,7 @@ COPY conf/prometheus-config.yaml /opt/prometheus/
 # jans-linux-setup sync
 # =====================
 
-ENV JANS_SOURCE_VERSION=cdcefd2ed3fbeef21c7d713453b07994c71393fc
+ENV JANS_SOURCE_VERSION=8beb2b2d0f07e6ca536c2699d229250e498d1c07
 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
 
 # note that as we're pulling from a monorepo (with multiple project in it)

diff --git a/docker-casa/README.md b/docker-casa/README.md
@@ -154,4 +154,3 @@ Hybrid persistence supports all available persistence types. To configure hybrid
         "session": "spanner",
     }
     ```
-
diff --git a/docker-flex-monolith/README.md b/docker-flex-monolith/README.md
@@ -85,4 +85,3 @@ Grab a fresh ubuntu 22.04 lts VM and run:
 ```bash
 wget https://raw.githubusercontent.com/GluuFederation/flex/main/automation/startflexmonolithdemo.sh && chmod u+x startflexmonolithdemo.sh && sudo bash startflexmonolithdemo.sh demoexample.gluu.org MYSQL
 ```
-
diff --git a/docs/README.md b/docs/README.md
@@ -26,3 +26,4 @@ Gluu Flex uses Agama to offer an alternative way to build web-based authenticati
 ## Support
 
 The Gluu Flex contract includes guaranteed response times and consultative support via our [support portal](https://support.gluu.org).
+
diff --git a/flex-cn-setup/README.md b/flex-cn-setup/README.md
@@ -52,4 +52,3 @@
     ```
 
     This command will generate executable called `pygluu-kubernetes.pyz` under the same directory.
-
diff --git a/flex-linux-setup/README.md b/flex-linux-setup/README.md
@@ -64,3 +64,4 @@ Uninstallation of Gluu Flex along with Jans
  - Uninstall Flex: `python3 /opt/jans/jans-setup/flex/flex-linux-setup/flex_setup.py --remove-flex`
  - Uninstall Jans: `python3 /opt/jans/jans-setup/install.py -uninstall`
  - Remove old files from `/var/www/html/` directory
+