diff --git a/Docker/Settings/V1/DB-Admin/pgsql/Dockerfile b/Docker/Settings/V1/DB-Admin/pgsql/Dockerfile index 63ae84701..e52fb7c06 100644 --- a/Docker/Settings/V1/DB-Admin/pgsql/Dockerfile +++ b/Docker/Settings/V1/DB-Admin/pgsql/Dockerfile @@ -30,7 +30,8 @@ RUN wget -nv -O /tmp/EdFi_AdminApi_Scripts.zip "https://pkgs.dev.azure.com/ed-fi rm -r /tmp/AdminApiScripts/AdminApi &&\ dos2unix /docker-entrypoint-initdb.d/3-run-adminapi-migrations.sh && \ dos2unix /tmp/AdminApiScripts/PgSql/* && \ - chmod -R 600 /tmp/AdminApiScripts/PgSql + chmod -R 700 /tmp/AdminApiScripts/PgSql && \ + chmod 700 /docker-entrypoint-initdb.d/3-run-adminapi-migrations.sh USER ${POSTGRES_USER} EXPOSE 5432 diff --git a/Docker/V1/Compose/pgsql/compose-build-binaries.yml b/Docker/V1/Compose/pgsql/compose-build-binaries.yml index b81e60a79..ccc31b7c0 100644 --- a/Docker/V1/Compose/pgsql/compose-build-binaries.yml +++ b/Docker/V1/Compose/pgsql/compose-build-binaries.yml @@ -28,6 +28,8 @@ services: build: context: ../../../ dockerfile: api.pgsql.Dockerfile + args: + ADMIN_API_VERSION: ${ADMIN_API_VERSION:-1.4.2} environment: ADMIN_POSTGRES_HOST: db-admin POSTGRES_PORT: 5432 @@ -41,9 +43,12 @@ services: ADMIN_API_VIRTUAL_NAME: ${ADMIN_API_VIRTUAL_NAME:-adminapi} ODS_API_VERSION: ${ODS_API_VERSION} AppSettings__AdminApiMode: ${ADMINAPI_MODE:-V1} + EnableDockerEnvironment: true + SwaggerSettings__EnableSwagger: true + EnableSwagger: true + Authentication__AllowRegistration: true # --- ADMIN_API_VERSION: ${ADMIN_API_VERSION} - API_INTERNAL_URL: ${API_INTERNAL_URL} AppSettings__DatabaseEngine: "PostgreSql" AppSettings__DefaultPageSizeLimit: ${PAGING_LIMIT:-25} AppSettings__DefaultPageSizeOffset: ${PAGING_OFFSET:-0}