Skip to content

GitLab

Commit a0724420 authored by Ben Whitmore's avatar Ben Whitmore
Browse files

fix(docker): don't pass server-only vars when building client bundle

parent 85fa4842
Pipeline #26214 failed with stage
Hide whitespace changes
Inline Side-by-side
Dockerfile-ci
View file @ a0724420
......@@ -11,23 +11,6 @@ ARG client_port
ARG manuscripts_table_columns
ARG manuscripts_table_first_column_width
ARG display_shortid_as_identifier
ARG journal_name
ARG journal_abbreviated_name
ARG journal_homepage
ARG publishing_webhook_url
ARG publishing_webhook_secret
ARG hypothesis_api_key
ARG hypothesis_group
ARG crossref_login
ARG crossref_password
ARG crossref_registrant
ARG crossref_depositor_name
ARG crossref_depositor_email
ARG crossref_publication_type
ARG crossref_use_sandbox
ARG doi_prefix
ARG published_article_location_prefix
ARG publication_license_url
ARG review_shared
ARG review_hide
......@@ -42,23 +25,6 @@ ENV INSTANCE_NAME $instance_name
ENV MANUSCRIPTS_TABLE_COLUMNS $manuscripts_table_columns
ENV MANUSCRIPTS_TABLE_FIRST_COLUMN_WIDTH $manuscripts_table_first_column_width
ENV DISPLAY_SHORTID_AS_IDENTIFIER $display_shortid_as_identifier
ENV JOURNAL_NAME $journal_name
ENV JOURNAL_ABBREVIATED_NAME $journal_abbreviated_name
ENV JOURNAL_HOMEPAGE $journal_homepage
ENV PUBLISHING_WEBHOOK_URL $publishing_webhook_url
ENV PUBLISHING_WEBHOOK_TOKEN $publishing_webhook_token
ENV HYPOTHESIS_API_KEY $hypothesis_api_key
ENV HYPOTHESIS_GROUP $hypothesis_group
ENV CROSSREF_LOGIN $crossref_login
ENV CROSSREF_PASSWORD $crossref_password
ENV CROSSREF_REGISTRANT $crossref_registrant
ENV CROSSREF_DEPOSITOR_NAME $crossref_depositor_name
ENV CROSSREF_DEPOSITOR_EMAIL $crossref_depositor_email
ENV CROSSREF_PUBLICATION_TYPE $crossref_publication_type
ENV CROSSREF_USE_SANDBOX $crossref_use_sandbox
ENV DOI_PREFIX $doi_prefix
ENV PUBLISHED_ARTICLE_LOCATION_PREFIX $published_article_location_prefix
ENV PUBLICATION_LICENSE_URL $publication_license_url
ENV REVIEW_SHARED $review_shared
ENV REVIEW_HIDE $review_hide
ENV HOME "/home/simplej"
......
Dockerfile-ci-test
View file @ a0724420
......@@ -12,23 +12,6 @@ ARG client_port
ARG manuscripts_table_columns
ARG manuscripts_table_first_column_width
ARG display_shortid_as_identifier
ARG journal_name
ARG journal_abbreviated_name
ARG journal_homepage
ARG publishing_webhook_url
ARG publishing_webhook_secret
ARG hypothesis_api_key
ARG hypothesis_group
ARG crossref_login
ARG crossref_password
ARG crossref_registrant
ARG crossref_depositor_name
ARG crossref_depositor_email
ARG crossref_publication_type
ARG crossref_use_sandbox
ARG doi_prefix
ARG published_article_location_prefix
ARG publication_license_url
ARG review_shared
ARG review_hide
......@@ -43,23 +26,6 @@ ENV INSTANCE_NAME $instance_name
ENV MANUSCRIPTS_TABLE_COLUMNS $manuscripts_table_columns
ENV MANUSCRIPTS_TABLE_FIRST_COLUMN_WIDTH $manuscripts_table_first_column_width
ENV DISPLAY_SHORTID_AS_IDENTIFIER $display_shortid_as_identifier
ENV JOURNAL_NAME $journal_name
ENV JOURNAL_ABBREVIATED_NAME $journal_abbreviated_name
ENV JOURNAL_HOMEPAGE $journal_homepage
ENV PUBLISHING_WEBHOOK_URL $publishing_webhook_url
ENV PUBLISHING_WEBHOOK_TOKEN $publishing_webhook_token
ENV HYPOTHESIS_API_KEY $hypothesis_api_key
ENV HYPOTHESIS_GROUP $hypothesis_group
ENV CROSSREF_LOGIN $crossref_login
ENV CROSSREF_PASSWORD $crossref_password
ENV CROSSREF_REGISTRANT $crossref_registrant
ENV CROSSREF_DEPOSITOR_NAME $crossref_depositor_name
ENV CROSSREF_DEPOSITOR_EMAIL $crossref_depositor_email
ENV CROSSREF_PUBLICATION_TYPE $crossref_publication_type
ENV CROSSREF_USE_SANDBOX $crossref_use_sandbox
ENV DOI_PREFIX $doi_prefix
ENV PUBLISHED_ARTICLE_LOCATION_PREFIX $published_article_location_prefix
ENV PUBLICATION_LICENSE_URL $publication_license_url
ENV REVIEW_SHARED $review_shared
ENV REVIEW_HIDE $review_hide
ENV HOME "/home/simplej"
......
Dockerfile-production
View file @ a0724420
......@@ -15,23 +15,6 @@ ARG public_client_port
ARG manuscripts_table_columns
ARG manuscripts_table_first_column_width
ARG display_shortid_as_identifier
ARG journal_name
ARG journal_abbreviated_name
ARG journal_homepage
ARG publishing_webhook_url
ARG publishing_webhook_secret
ARG hypothesis_api_key
ARG hypothesis_group
ARG crossref_login
ARG crossref_password
ARG crossref_registrant
ARG crossref_depositor_name
ARG crossref_depositor_email
ARG crossref_publication_type
ARG crossref_use_sandbox
ARG doi_prefix
ARG published_article_location_prefix
ARG publication_license_url
ARG review_shared
ARG review_hide
......@@ -49,23 +32,6 @@ ENV PUBLIC_CLIENT_PROTOCOL $public_client_protocol
ENV MANUSCRIPTS_TABLE_COLUMNS $manuscripts_table_columns
ENV MANUSCRIPTS_TABLE_FIRST_COLUMN_WIDTH $manuscripts_table_first_column_width
ENV DISPLAY_SHORTID_AS_IDENTIFIER $display_shortid_as_identifier
ENV JOURNAL_NAME $journal_name
ENV JOURNAL_ABBREVIATED_NAME $journal_abbreviated_name
ENV JOURNAL_HOMEPAGE $journal_homepage
ENV PUBLISHING_WEBHOOK_URL $publishing_webhook_url
ENV PUBLISHING_WEBHOOK_TOKEN $publishing_webhook_token
ENV HYPOTHESIS_API_KEY $hypothesis_api_key
ENV HYPOTHESIS_GROUP $hypothesis_group
ENV CROSSREF_LOGIN $crossref_login
ENV CROSSREF_PASSWORD $crossref_password
ENV CROSSREF_REGISTRANT $crossref_registrant
ENV CROSSREF_DEPOSITOR_NAME $crossref_depositor_name
ENV CROSSREF_DEPOSITOR_EMAIL $crossref_depositor_email
ENV CROSSREF_PUBLICATION_TYPE $crossref_publication_type
ENV CROSSREF_USE_SANDBOX $crossref_use_sandbox
ENV DOI_PREFIX $doi_prefix
ENV PUBLISHED_ARTICLE_LOCATION_PREFIX $published_article_location_prefix
ENV PUBLICATION_LICENSE_URL $publication_license_url
ENV REVIEW_SHARED $review_shared
ENV REVIEW_HIDE $review_hide
......
Dockerfile-production-elife
View file @ a0724420
......@@ -14,23 +14,6 @@ ARG public_client_port
ARG manuscripts_table_columns
ARG manuscripts_table_first_column_width
ARG display_shortid_as_identifier
ARG journal_name
ARG journal_abbreviated_name
ARG journal_homepage
ARG publishing_webhook_url
ARG publishing_webhook_secret
ARG hypothesis_api_key
ARG hypothesis_group
ARG crossref_login
ARG crossref_password
ARG crossref_registrant
ARG crossref_depositor_name
ARG crossref_depositor_email
ARG crossref_publication_type
ARG crossref_use_sandbox
ARG doi_prefix
ARG published_article_location_prefix
ARG publication_license_url
ARG review_shared
ARG review_hide
......@@ -48,23 +31,6 @@ ENV PUBLIC_CLIENT_PROTOCOL $public_client_protocol
ENV MANUSCRIPTS_TABLE_COLUMNS $manuscripts_table_columns
ENV MANUSCRIPTS_TABLE_FIRST_COLUMN_WIDTH $manuscripts_table_first_column_width
ENV DISPLAY_SHORTID_AS_IDENTIFIER $display_shortid_as_identifier
ENV JOURNAL_NAME $journal_name
ENV JOURNAL_ABBREVIATED_NAME $journal_abbreviated_name
ENV JOURNAL_HOMEPAGE $journal_homepage
ENV PUBLISHING_WEBHOOK_URL $publishing_webhook_url
ENV PUBLISHING_WEBHOOK_TOKEN $publishing_webhook_token
ENV HYPOTHESIS_API_KEY $hypothesis_api_key
ENV HYPOTHESIS_GROUP $hypothesis_group
ENV CROSSREF_LOGIN $crossref_login
ENV CROSSREF_PASSWORD $crossref_password
ENV CROSSREF_REGISTRANT $crossref_registrant
ENV CROSSREF_DEPOSITOR_NAME $crossref_depositor_name
ENV CROSSREF_DEPOSITOR_EMAIL $crossref_depositor_email
ENV CROSSREF_PUBLICATION_TYPE $crossref_publication_type
ENV CROSSREF_USE_SANDBOX $crossref_use_sandbox
ENV DOI_PREFIX $doi_prefix
ENV PUBLISHED_ARTICLE_LOCATION_PREFIX $published_article_location_prefix
ENV PUBLICATION_LICENSE_URL $publication_license_url
ENV REVIEW_SHARED $review_shared
ENV REVIEW_HIDE $review_hide
......
docker-compose.production.yml
View file @ a0724420
......@@ -21,23 +21,6 @@ services:
- manuscripts_table_columns=${MANUSCRIPTS_TABLE_COLUMNS}
- manuscripts_table_first_column_width=${MANUSCRIPTS_TABLE_FIRST_COLUMN_WIDTH}
- display_shortid_as_identifier=${DISPLAY_SHORTID_AS_IDENTIFIER}
- publishing_webhook_url=${PUBLISHING_WEBHOOK_URL}
- publishing_webhook_token=${PUBLISHING_WEBHOOK_TOKEN}
- journal_name=${JOURNAL_NAME}
- journal_abbreviated_name=${JOURNAL_ABBREVIATED_NAME}
- journal_homepage=${JOURNAL_HOMEPAGE}
- hypothesis_api_key=${HYPOTHESIS_API_KEY}
- hypothesis_group=${HYPOTHESIS_GROUP}
- crossref_login=${CROSSREF_LOGIN}
- crossref_password=${CROSSREF_PASSWORD}
- crossref_registrant=${CROSSREF_REGISTRANT}
- crossref_depositor_name=${CROSSREF_DEPOSITOR_NAME}
- crossref_depositor_email=${CROSSREF_DEPOSITOR_EMAIL}
- crossref_publication_type=${CROSSREF_PUBLICATION_TYPE}
- crossref_use_sandbox=${CROSSREF_USE_SANDBOX}
- doi_prefix=${DOI_PREFIX}
- published_article_location_prefix=${PUBLISHED_ARTICLE_LOCATION_PREFIX}
- publication_license_url=${PUBLICATION_LICENSE_URL}
- review_shared=${REVIEW_SHARED}
- review_hide=${REVIEW_HIDE}
......
docker-compose.yml
View file @ a0724420
......@@ -29,7 +29,6 @@ services:
- MANUSCRIPTS_TABLE_COLUMNS=${MANUSCRIPTS_TABLE_COLUMNS}
- MANUSCRIPTS_TABLE_FIRST_COLUMN_WIDTH=${MANUSCRIPTS_TABLE_FIRST_COLUMN_WIDTH}
- DISPLAY_SHORTID_AS_IDENTIFIER=${DISPLAY_SHORTID_AS_IDENTIFIER:-false}
- GOOGLE_SPREADSHEET_ID=${GOOGLE_SPREADSHEET_ID}
- REVIEW_SHARED=${REVIEW_SHARED:-false}
- REVIEW_HIDE=${REVIEW_HIDE:-false}
volumes:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment