diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a01c9ac..7a1ab227 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,8 +18,7 @@ jobs: - run: pipx install poetry==1.6.1 - uses: actions/setup-python@v4 with: - python-version: '3.11' - cache: 'poetry' + python-version: '3.10' - run: poetry install # Build config using tiptenbrink/confspawn - name: Config @@ -36,7 +35,7 @@ jobs: file_pattern: use/ build_db: - # if: ${{ false }} + if: ${{ false }} strategy: matrix: target: ['localdev', 'staging' ] @@ -45,7 +44,7 @@ jobs: env: ${{ matrix.target }} build_server: - # if: ${{ false }} + if: ${{ false }} strategy: matrix: target: [ 'localdev', 'staging' ] @@ -56,7 +55,7 @@ jobs: GH_DODEKACOMCOM_TOKEN: ${{ secrets.GH_DODEKACOMCOM_TOKEN }} build_kv: - # if: ${{ false }} + if: ${{ false }} strategy: matrix: target: [ 'localdev', 'staging' ] diff --git a/config.toml b/config.toml index 43639600..e69de29b 100644 --- a/config.toml +++ b/config.toml @@ -1,101 +0,0 @@ -[main] -docker_net_name = "dodeka" -project = "dodeka" - -[db] -service_name = "db" -# must match --1 -container_name = "dodeka-db-1" -postgres_conf_dir = "/dodeka_conf" -init_dir = "/dodeka_init" -# metaconfig -image_name = "ghcr.io/dsav-dodeka/postgres" -host_host = "127.0.0.1" -host_port = "3141" -container_port = "3141" -resources_target = "/dodeka-db" -volume_name = "dodeka-db-volume" -db_name = "dodeka" -db_user = "dodeka" -# using default -db_name_admin = "postgres" -image_desc = "Image for D.S.A.V. Dodeka PostgreSQL instance." - -[kv] -redisjson_version = "v2.6.6" -service_name = "kv" -# must match --1 -container_name = "dodeka-kv-1" -# metaconfig -image_name = "ghcr.io/dsav-dodeka/redis" -host_host = "127.0.0.1" -host_port = "6379" -container_port = "6379" - -[server] -project = "dodeka" -service_name = "server" -# must match --1 -container_name = "dodeka-server-1" -# metaconfig -image_name = "ghcr.io/dsav-dodeka/server" -deps_image_name = "ghcr.io/dsav-dodeka/server-deps" -host_host = "127.0.0.1" -host_port = "4241" -container_port = "4241" -issuer = "https://api.dsavdodeka.nl" -frontend_client_id = "dodekaweb_client" -backend_client_id = "dodekabackend_client" -signup_url = "https://www.av40.nl/index.php?page=Inschrijfformulier&sid=1" -onboard_email = "comcom@dsavdodeka.nl" -smtp_port = 587 -realm="dodeka" - -[confspawn_env.production] -name = "production" -version = "v2.0.1" -allowed_envs = "\"production\"" -# Only the credentials url is with trailing slash, the rest should all be without -api_root = "https://api.dsavdodeka.nl" -valid_redirects = "\"https://dsavdodeka.nl/auth/callback\"" -credentials_url = "https://api.dsavdodeka.nl/credentials/" -pages_url = "https://dsavdodeka.nl" -smtp_server = "host.docker.internal" -restart = "always" -mail_enabled = true - -[confspawn_env.staging] -name = "staging" -version = "staging" -allowed_envs = "\"staging\"" -api_root = "https://apidemo.tipten.nl" -valid_redirects = "\"https://demo.tipten.nl/auth/callback\"" -credentials_url = "https://apidemo.tipten.nl/credentials/" -pages_url = "https://demo.tipten.nl" -smtp_server = "mail.dsavdodeka.nl" -restart = "always" -mail_enabled = true - -[confspawn_env.test] -name = "test" -version = "test" -restart = "\"no\"" -mail_enabled = false - -[confspawn_env.localdev] -name = "localdev" -version = "localdev" -db_password = "postpost" -kv_password = "redisredis" -allowed_envs = "\"envless\", \"localdev\", \"test\"" -api_root = "http://localhost:4243" -valid_redirects = "\"http://localhost:3000/auth/callback\"" -credentials_url = "http://localhost:4243/credentials/" -smtp_server = "mail.dsavdodeka.nl" -restart = "\"no\"" -mail_enabled = false - -[confspawn_env.less] -name = "less" -version = "less" -mail_enabled = false \ No newline at end of file