Skip to content

Commit

Permalink
Merge pull request #7122 from uktrade/chore/dependencies-2024-09-05
Browse files Browse the repository at this point in the history
Chore/dependencies 2024 09 05
  • Loading branch information
bau123 authored Sep 6, 2024
2 parents 689f13f + 1a348a8 commit 8892810
Show file tree
Hide file tree
Showing 7 changed files with 199 additions and 144 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/sre-docker-registry/data-hub-frontend-dependencies:4.3.3
FROM gcr.io/sre-docker-registry/data-hub-frontend-dependencies:4.3.4

ARG CURRENT_UID
ARG CURRENT_GID
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ COPY --chown=node:node package*.json "$HOME/"
WORKDIR $HOME

# Install specific version of cypress
RUN npm install -g cypress@13.13.2 \
RUN npm install -g cypress@13.14.1 \
&& npx cypress verify \
&& npx cypress cache path \
&& npx cypress cache list \
Expand Down
4 changes: 3 additions & 1 deletion docs/Docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ _Helpful Docker commands that allow you to bring up containers, run a bunch of t
**Note for Mac Users:** By default, docker on Mac will restrict itself to using just 2GB of memory. This [should be increased](https://docs.docker.com/docker-for-mac/#resources) to at least 6GB to avoid running in to unexpected problems.

**Note for Mac Users 2:** Should you ever come across this error:

```
qemu: uncaught target signal 11 (Segmentation fault) - core dumped
```

Go to _Docker Desktop -> Settings -> General_ and check the
_Use Rosetta for x86/amd64 emulation on Apple Silicon_ checkbox.
That should fix the issue.
Expand All @@ -33,7 +35,7 @@ Ensure you have [gcloud CLI installed](https://cloud.google.com/sdk/docs/install
> If you have issues when building the dependencies image, especially if you are using a Mac with an Apple chip, this is most likely due to incompatibility with the `arm` architecture; instead you need to build on `amd` architecture. Please refer to [troubleshooting guide](./Troubleshooting.md) and follow the steps under the Building dependency images section, before retrying the build command below.
```bash
export VERSION=4.3.3 # Increment this version each time when you edit Dockerfile.
export VERSION=4.3.4 # Increment this version each time when you edit Dockerfile.

docker build -f Dockerfile.dependencies -t data-hub-frontend-dependencies . --platform linux/amd64

Expand Down
Loading

0 comments on commit 8892810

Please sign in to comment.