-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
remove unfied workflow Co-authored-by: Muhammad Farhan <[email protected]>
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM ubuntu:focal as app | ||
FROM ubuntu:focal AS app | ||
MAINTAINER [email protected] | ||
Check warning on line 2 in dockerfiles/commerce-coordinator.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
Check warning on line 2 in dockerfiles/commerce-coordinator.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
Check warning on line 2 in dockerfiles/commerce-coordinator.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
Check warning on line 2 in dockerfiles/commerce-coordinator.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
Check warning on line 2 in dockerfiles/commerce-coordinator.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
|
||
|
||
|
||
|
@@ -37,11 +37,11 @@ RUN rm -rf /var/lib/apt/lists/* | |
RUN ln -s /usr/bin/python3 /usr/bin/python | ||
|
||
RUN locale-gen en_US.UTF-8 | ||
ENV LANG en_US.UTF-8 | ||
ENV LANGUAGE en_US:en | ||
ENV LC_ALL en_US.UTF-8 | ||
ENV LANG=en_US.UTF-8 | ||
ENV LANGUAGE=en_US:en | ||
ENV LC_ALL=en_US.UTF-8 | ||
|
||
ENV DJANGO_SETTINGS_MODULE commerce_coordinator.settings.production | ||
ENV DJANGO_SETTINGS_MODULE=commerce_coordinator.settings.production | ||
|
||
EXPOSE 8140 | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM ubuntu:focal as base | ||
FROM ubuntu:focal AS base | ||
|
||
# System requirements | ||
# - git; Used to pull in particular requirements from github rather than pypi, | ||
|
@@ -35,12 +35,12 @@ ENV PATH="$NODE_ENV/bin:$PATH" | |
RUN npm install -g [email protected] | ||
|
||
RUN locale-gen en_US.UTF-8 | ||
ENV LANG en_US.UTF-8 | ||
ENV LANGUAGE en_US:en | ||
ENV LC_ALL en_US.UTF-8 | ||
ENV DJANGO_SETTINGS_MODULE credentials.settings.production | ||
ENV OPENEDX_ATLAS_PULL true | ||
ENV CREDENTIALS_CFG "minimal.yml" | ||
ENV LANG=en_US.UTF-8 | ||
ENV LANGUAGE=en_US:en | ||
ENV LC_ALL=en_US.UTF-8 | ||
ENV DJANGO_SETTINGS_MODULE=credentials.settings.production | ||
ENV OPENEDX_ATLAS_PULL=true | ||
ENV CREDENTIALS_CFG="minimal.yml" | ||
Check warning on line 43 in dockerfiles/credentials.Dockerfile GitHub Actions / build-and-push-imageSensitive data should not be used in the ARG or ENV commands
Check warning on line 43 in dockerfiles/credentials.Dockerfile GitHub Actions / build-and-push-imageSensitive data should not be used in the ARG or ENV commands
Check warning on line 43 in dockerfiles/credentials.Dockerfile GitHub Actions / build-and-push-imageSensitive data should not be used in the ARG or ENV commands
Check warning on line 43 in dockerfiles/credentials.Dockerfile GitHub Actions / build-and-push-imageSensitive data should not be used in the ARG or ENV commands
Check warning on line 43 in dockerfiles/credentials.Dockerfile GitHub Actions / build-and-push-imageSensitive data should not be used in the ARG or ENV commands
|
||
|
||
EXPOSE 18150 | ||
RUN useradd -m --shell /bin/false app | ||
|
@@ -94,7 +94,7 @@ CMD gunicorn --workers=2 --name credentials -c /edx/app/credentials/credentials/ | |
|
||
# We don't switch back to the app user for devstack because we need devstack users to be | ||
# able to update requirements and generally run things as root. | ||
FROM base as dev | ||
FROM base AS dev | ||
USER root | ||
ENV DJANGO_SETTINGS_MODULE credentials.settings.devstack | ||
Check warning on line 99 in dockerfiles/credentials.Dockerfile GitHub Actions / build-and-push-imageLegacy key/value format with whitespace separator should not be used
Check warning on line 99 in dockerfiles/credentials.Dockerfile GitHub Actions / build-and-push-imageLegacy key/value format with whitespace separator should not be used
Check warning on line 99 in dockerfiles/credentials.Dockerfile GitHub Actions / build-and-push-imageLegacy key/value format with whitespace separator should not be used
Check warning on line 99 in dockerfiles/credentials.Dockerfile GitHub Actions / build-and-push-imageLegacy key/value format with whitespace separator should not be used
Check warning on line 99 in dockerfiles/credentials.Dockerfile GitHub Actions / build-and-push-imageLegacy key/value format with whitespace separator should not be used
|
||
RUN pip install -r /edx/app/credentials/credentials/requirements/dev.txt | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM ubuntu:focal as app | ||
FROM ubuntu:focal AS app | ||
LABEL org.opencontainers.image.authors="[email protected]" | ||
|
||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM ubuntu:focal as app | ||
FROM ubuntu:focal AS app | ||
MAINTAINER [email protected] | ||
Check warning on line 2 in dockerfiles/enterprise-catalog.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
Check warning on line 2 in dockerfiles/enterprise-catalog.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
Check warning on line 2 in dockerfiles/enterprise-catalog.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
Check warning on line 2 in dockerfiles/enterprise-catalog.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
|
||
|
||
# Packages installed: | ||
|
@@ -89,7 +89,7 @@ CMD ["gunicorn", "--workers=2", "--name", "enterprise_catalog", "-c", "/edx/app/ | |
# Create newrelic image used by the experimental docker shim. # | ||
############################################################### | ||
# TODO: remove this after we migrate to k8s since it will serve no more purpose. | ||
FROM app as newrelic | ||
FROM app AS newrelic | ||
RUN pip install newrelic | ||
CMD ["newrelic-admin", "run-program", "gunicorn", "--workers=2", "--name", "enterprise_catalog", "-c", "/edx/app/enterprise_catalog/enterprise_catalog/enterprise_catalog/docker_gunicorn_configuration.py", "--log-file", "-", "--max-requests=1000", "enterprise_catalog.wsgi:application"] | ||
|
||
|
@@ -98,7 +98,7 @@ CMD ["newrelic-admin", "run-program", "gunicorn", "--workers=2", "--name", "ente | |
################################# | ||
# TODO: remove this after we migrate to k8s. It already isn't used today, but just defer changes until absolutely | ||
# necessary for safety. | ||
FROM app as legacy_devapp | ||
FROM app AS legacy_devapp | ||
# Dev ports | ||
EXPOSE 18160 | ||
EXPOSE 18161 | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM ubuntu:focal as app | ||
FROM ubuntu:focal AS app | ||
MAINTAINER [email protected] | ||
Check warning on line 2 in dockerfiles/enterprise-subsidy.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
Check warning on line 2 in dockerfiles/enterprise-subsidy.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
Check warning on line 2 in dockerfiles/enterprise-subsidy.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
Check warning on line 2 in dockerfiles/enterprise-subsidy.Dockerfile GitHub Actions / build-and-push-imageThe MAINTAINER instruction is deprecated, use a label instead to define an image author
|
||
|
||
# Packages installed: | ||
|
@@ -73,10 +73,10 @@ RUN virtualenv -p python${PYTHON_VERSION} $VIRTUAL_ENV | |
ENV PATH="$VIRTUAL_ENV/bin:$PATH" | ||
|
||
RUN locale-gen en_US.UTF-8 | ||
ENV LANG en_US.UTF-8 | ||
ENV LANGUAGE en_US:en | ||
ENV LC_ALL en_US.UTF-8 | ||
ENV DJANGO_SETTINGS_MODULE enterprise_subsidy.settings.production | ||
ENV LANG=en_US.UTF-8 | ||
ENV LANGUAGE=en_US:en | ||
ENV LC_ALL=en_US.UTF-8 | ||
ENV DJANGO_SETTINGS_MODULE=enterprise_subsidy.settings.production | ||
|
||
EXPOSE 18280 | ||
RUN useradd -m --shell /bin/false app | ||
|
@@ -102,11 +102,11 @@ USER app | |
CMD gunicorn --workers=2 --name enterprise-subsidy -c /edx/app/enterprise-subsidy/enterprise_subsidy/docker_gunicorn_configuration.py --log-file - --max-requests=1000 enterprise_subsidy.wsgi:application | ||
Check warning on line 102 in dockerfiles/enterprise-subsidy.Dockerfile GitHub Actions / build-and-push-imageJSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals
Check warning on line 102 in dockerfiles/enterprise-subsidy.Dockerfile GitHub Actions / build-and-push-imageJSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals
Check warning on line 102 in dockerfiles/enterprise-subsidy.Dockerfile GitHub Actions / build-and-push-imageJSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals
Check warning on line 102 in dockerfiles/enterprise-subsidy.Dockerfile GitHub Actions / build-and-push-imageJSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals
|
||
|
||
|
||
FROM app as newrelic | ||
FROM app AS newrelic | ||
RUN pip install newrelic | ||
CMD gunicorn --workers=2 --name enterprise-subsidy -c /edx/app/enterprise-subsidy/enterprise_subsidy/docker_gunicorn_configuration.py --log-file - --max-requests=1000 enterprise_subsidy.wsgi:application | ||
|
||
FROM app as devstack | ||
FROM app AS devstack | ||
USER root | ||
RUN pip install -r requirements/dev.txt | ||
USER app | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
FROM ubuntu:focal as app | ||
FROM ubuntu:focal AS app | ||
MAINTAINER [email protected] | ||
|
||
# ENV variables for Python 3.12 support | ||
|
@@ -80,7 +80,7 @@ USER app | |
CMD gunicorn --workers=2 --name designer -c /edx/app/designer/designer/docker_gunicorn_configuration.py --log-file - --max-requests=1000 designer.wsgi:application | ||
|
||
# Change into dev app | ||
FROM app as devstack | ||
FROM app AS devstack | ||
# Install dependencies as root and revert back to application user | ||
USER root | ||
RUN pip install -r /edx/app/designer/requirements/dev.txt | ||
|