v1.8.0-RC

README.md

@@ -23,12 +23,12 @@
 * [Docker Engine](https://www.docker.com/)
     - 19.03 以降
 
-Dockerコンテナ起動などの操作には [Docker Compose](https://github.com/docker/compose) を利用します。Docker Composeはv2もしくは [1.28.0](https://docs.docker.com/compose/release-notes/#1280) 以降のものが必要となりますので、事前にインストールを行ってください。
+Dockerコンテナ起動などの操作には [Docker Compose](https://github.com/docker/compose) を利用します。Docker Composeはv2以降のものが必要となりますので、事前にインストールを行ってください。
 
 Docker, Docker Composeのインストール手順については以下に示すリンク先の情報などを参照してください。
 
 * [Install Docker Engine](https://docs.docker.com/engine/install/)
-* [Docker Compose v2 - Where to get Docker Compose](https://github.com/docker/compose#linux)
+* [Install Docker Compose CLI plugin](https://docs.docker.com/compose/install/compose-plugin/)
 
 またコンフィグサーバのセットアップスクリプトを実行するには以下のコマンドが必要となります。OSのパッケージなどを利用して事前にインストールしてください。
 

docker-compose.yml

@@ -1,7 +1,6 @@
-version: '3.8'
 services:
   nginx:
-    image: harbor.vcloud.nii.ac.jp/sinetstream/sscfg-ui:${SSCFG_VERSION:-1.6.0}
+    image: harbor.vcloud.nii.ac.jp/sinetstream/sscfg-ui:${SSCFG_VERSION:-1.6.1-SNAPSHOT}
     restart: always
     ports:
       - 443:443
@@ -36,7 +35,7 @@ services:
       - sscfg
       - shibboleth
   postgres:
-    image: postgres:${POSTGRES_VERSION:-13.5}
+    image: postgres:13.11
     restart: always
     volumes:
       - type: volume
@@ -47,7 +46,7 @@ services:
       POSTGRES_USER: sscfg
     env_file: .env.sscfg
   vault:
-    image: &vault_image vault:${VAULT_VERSION:-1.9.0}
+    image: &vault_image vault:1.13.2
     restart: always
     volumes:
       - &vault_vol
@@ -75,7 +74,7 @@ services:
     profiles:
       - setup
   redis:
-    image: redis:${REDIS_VERSION:-6.2}
+    image: redis:7.0
     restart: always
   shibboleth:
     image: harbor.vcloud.nii.ac.jp/sinetstream/sscfg-shib-sp:${SSCFG_VERSION:-1.6.0}

docker/docker-compose-build.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   sscfg-ui:
     image: harbor.vcloud.nii.ac.jp/sinetstream/sscfg-ui:${IMG_TAG}

docker/nginx/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16.13 as build
+FROM node:16.20 as build
 
 WORKDIR /home/node/app
 COPY ./sscfg-ui/package*.json ./
@@ -8,12 +8,12 @@ COPY ./sscfg-ui ./
 RUN npm run build
 
 # -----------------------------------------------------------------
-FROM jekyll/jekyll:4.2.0 as docs
+FROM jekyll/jekyll:4.2.2 as docs
 COPY ./sscfg-manual /srv/jekyll
 RUN jekyll build
 
 # -----------------------------------------------------------------
-FROM nginx:1.21
+FROM nginx:1.24
 
 COPY --from=build /home/node/app/dist /var/www/html/
 COPY --from=docs /srv/jekyll/_site /var/www/manual/

docker/nginx/misc/update-version-info.sh

@@ -5,7 +5,7 @@ set -ue
 
 generate_git_info () {
   cat <<EOF > .env.local
-VUE_APP_VERSION=${SSCFG_VERSION:-1.6.0}
+VUE_APP_VERSION=${SSCFG_VERSION:-1.6.1-SNAPSHOT}
 VUE_APP_GIT_COMMIT_HASH=$(git rev-parse --short HEAD)
 EOF
 }

docker/nginx/sscfg-manual/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   jekyll:
-    image: jekyll/jekyll:4.2.0
+    image: jekyll/jekyll:4.2.2
     volumes:
     - .:/srv/jekyll
     command: jekyll serve --incremental

docker/nginx/sscfg-manual/renovate.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    "group:allNonMajor"
+  ],
+  "prHourlyLimit": 0,
+  "prConcurrentLimit": 0,
+  "enabledManagers": ["docker-compose"],
+  "separateMultipleMajor": true,
+  "timezone": "Asia/Tokyo",
+  "schedule": [
+    "before 11am on friday"
+  ],
+  "assignees": ["suri_endo"]
+}

docker/nginx/sscfg-ui/.eslintrc.js

@@ -16,6 +16,6 @@ module.exports = {
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'vue/valid-v-slot': ['error', { 'allowModifiers': true }],
+    'vue/valid-v-slot': ['error', { allowModifiers: true }],
   },
 };

docker/nginx/sscfg-ui/cypress.config.ts

@@ -0,0 +1,54 @@
+import {defineConfig} from 'cypress';
+
+function generatePassword(length = 16) {
+  let ret = '';
+  const letters = [...Array(10)].map((x, i) => String.fromCharCode(i + 48)).concat(
+    [...Array(26)].map((x, i) => String.fromCharCode(i + 65)),
+    [...Array(26)].map((x, i) => String.fromCharCode(i + 97)),
+  );
+  for (let i = 0; i < length; i += 1) {
+    ret += letters[Math.floor(Math.random() * letters.length)];
+  }
+  return ret;
+}
+
+const password = generatePassword();
+const env = process.env.VUE_APP_FEATHERS_URL != null
+  ? {
+      password,
+      rest_url: process.env.VUE_APP_FEATHERS_URL,
+    }
+  : { password };
+
+export default defineConfig({
+  e2e: {
+    specPattern: 'tests/e2e/specs/*.ts',
+    supportFile: 'tests/e2e/support/index.ts',
+    setupNodeEvents(on, config) {
+      require('@cypress/code-coverage/task')(on, config);
+      return config
+    },
+  },
+  downloadsFolder: 'tests/e2e/downloads',
+  fixturesFolder: 'tests/e2e/fixtures',
+  screenshotsFolder: 'tests/e2e/screenshots',
+  videosFolder: 'tests/e2e/videos',
+  "video": false,
+  "env": {
+    "admin": "admin",
+    "admin_password": "",
+    "username": "test-user",
+    "email": "[email protected]",
+    "display_name": "test user",
+    "codeCoverageTasksRegistered": true,
+    ...env,
+  },
+  "retries": {
+    "runMode": 2,
+    "openMode": 0
+  },
+  "reporter": "cypress-multi-reporters",
+  "reporterOptions": {
+    "configFile": "reporter-config.json"
+  }
+});