Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce size of local Docker images by fixing .dockerignore patterns #2360

Merged
merged 3 commits into from
Jan 30, 2023
Merged

Reduce size of local Docker images by fixing .dockerignore patterns #2360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
463c376
Move frontend build later in Dockerfile
NevilleS Jan 24, 2023
cf661b5
Fix .dockerignore paths for subdirectories
NevilleS Jan 24, 2023
67a50d1
Update CHANGELOG.md
NevilleS Jan 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,31 @@ src/ui-build/

# Frontend
**/node_modules
.next
**/.next


# Ignore Python-Specific Files
.mypy_cache/
.nox/
.pytest_cache/
__pycache__/
.coverage
**.*.pyc
**.*.pyo
**.*.pyd
**/.mypy_cache/
**/.nox/
**/.pytest_cache/
**/__pycache__/
**/.coverage
**/*.pyc
**/*.pyo
**/*.pyd

# pyenv
.python-version

# Environments
.env
.venv
env/
venv/
**/.env
**/.venv
**/env/
**/venv/

# Editors
.vscode/
.idea/
**/.vscode/
**/.idea/

# the docs directory is needed when building the docs container so it can't be in the
# .dockerignore
Expand All @@ -44,7 +44,7 @@ venv/
# Ignore cypress artifacts
**/videos/
**/screenshots/
.DS_Store
**/.DS_Store

# Dev files
.pre-commit-config.yaml
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ The types of changes are:

* Add a check to the catchall path to prevent returning paths outside of the UI directory [#2330](https://github.com/ethyca/fides/pull/2330)

### Developer Experience

* Reduce size of local Docker images by fixing `.dockerignore` patterns [#2360](https://github.com/ethyca/fides/pull/2360)

## [2.5.0](https://github.com/ethyca/fides/compare/2.4.0...2.5.0)

### Docs
Expand Down
24 changes: 12 additions & 12 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@
ARG PYTHON_VERSION="3.10.7"


###################
## Frontend Base ##
###################
FROM node:16 as frontend

# Build the admin-ui frontend
WORKDIR /fides/clients/admin-ui
COPY clients/admin-ui/package.json clients/admin-ui/package-lock.json ./
RUN npm install
COPY clients/admin-ui/ .
RUN npm run export

#########################
## Compile Python Deps ##
#########################
Expand Down Expand Up @@ -99,6 +87,18 @@ FROM backend as dev

RUN pip install -e . --no-deps

###################
## Frontend Base ##
###################
FROM node:16-slim as frontend

# Build the admin-ui frontend
WORKDIR /fides/clients/admin-ui
COPY clients/admin-ui/package.json clients/admin-ui/package-lock.json ./
RUN npm install
COPY clients/admin-ui/ .
RUN npm run export

#############################
## Production Application ##
#############################
Expand Down