Skip to content

Commit

Permalink
Reinstate mitodl user and add staticfiles directory before applying p…
Browse files Browse the repository at this point in the history
…ermission
  • Loading branch information
jonkafton committed Feb 7, 2024
1 parent 5c9b82f commit a40cac7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 14 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/e2e-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,3 @@ jobs:
uses: actions/upload-pages-artifact@v2
with:
path: e2e_testing/playwright-report

- name: Deploy to GitHub Pages
if: always()
id: deployment
uses: actions/deploy-pages@v2
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN chown -R mitodl:mitodl /src
RUN mkdir ${VIRTUAL_ENV} && chown -R mitodl:mitodl ${VIRTUAL_ENV}

## Install poetry itself, and pre-create a venv with predictable name
# USER mitodl
USER mitodl
RUN curl -sSL https://install.python-poetry.org \
| \
POETRY_VERSION=${POETRY_VERSION} \
Expand All @@ -47,14 +47,15 @@ RUN python3 -m venv $VIRTUAL_ENV
RUN poetry install

# Add project
# USER root
USER root
COPY . /src
WORKDIR /src
# RUN chown -R mitodl:mitodl /src
RUN mkdir /src/staticfiles
RUN chown -R mitodl:mitodl /src

RUN apt-get clean && apt-get purge

# USER mitodl
USER mitodl

EXPOSE 8063
ENV PORT 8063
Expand Down
5 changes: 0 additions & 5 deletions docker-compose-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ services:
web:
build:
context: .
# dockerfile: Dockerfile-e2e
environment:
PORT: 8061
env_file: .env.ci
Expand All @@ -37,8 +36,6 @@ services:
- "8061:8061"
links:
- db
volumes:
- .:/src

e2e-tests:
build:
Expand All @@ -51,5 +48,3 @@ services:
condition: service_healthy
links:
- nginx
profiles:
- e2e-tests

0 comments on commit a40cac7

Please sign in to comment.