From f6d8c6fe8619531858bdd2393c00866381c1b85e Mon Sep 17 00:00:00 2001 From: Steve Haffenden Date: Fri, 14 May 2021 16:15:57 +0200 Subject: [PATCH] Initial set of changes that made Aleph run locally on M1 mac --- Dockerfile | 2 +- docker-compose.dev.yml | 3 ++- ui/Dockerfile | 7 ++++++- ui/package.json | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 28a1fa5632..8c4f35f26d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND noninteractive # build-essential RUN apt-get -qq -y update \ && apt-get -qq -y install locales \ - ca-certificates postgresql-client curl jq\ + ca-certificates postgresql-client libpq-dev curl jq\ python3-pip python3-icu python3-psycopg2 \ python3-lxml python3-crypto \ && apt-get -qq -y autoremove \ diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index f8fd49bd65..6861f62a23 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -14,8 +14,9 @@ services: POSTGRES_DATABASE: aleph elasticsearch: - image: ghcr.io/alephdata/aleph-elasticsearch:564fdd523d70bc15b4f5bbeae9cea6d222114e75 + image: ghcr.io/alephdata/aleph-elasticsearch:c4c9b703d274df3844175565253f2daff3dd760b hostname: elasticsearch + restart: on-failure environment: - discovery.type=single-node - "ES_JAVA_OPTS=-Xms1g -Xmx1g" diff --git a/ui/Dockerfile b/ui/Dockerfile index e9c0b56f30..03aa1981a5 100644 --- a/ui/Dockerfile +++ b/ui/Dockerfile @@ -1,5 +1,10 @@ -FROM node:14-slim +FROM node:16-slim +ENV DEBIAN_FRONTEND noninteractive + +RUN apt-get -qq -y update \ + && apt-get -qq -y install python build-essential + RUN mkdir /alephui WORKDIR /alephui diff --git a/ui/package.json b/ui/package.json index cdd46a3a52..7286ee369a 100644 --- a/ui/package.json +++ b/ui/package.json @@ -25,7 +25,7 @@ "js-file-download": "^0.4.9", "jwt-decode": "^3.0.0", "lodash": "^4.17.11", - "node-sass": "^4.13.1", + "node-sass": "^6.0.0", "numeral": "^2.0.6", "papaparse": "^5.1.0", "query-string": "^7.0.0",