Compare commits

...

1 Commits

Author SHA1 Message Date
Isaac Abadi
51512a60da Fixed docker build issues 2022-05-01 00:22:28 -04:00
2 changed files with 13 additions and 12 deletions

View File

@@ -1,19 +1,18 @@
FROM ubuntu:20.04 AS ffmpeg FROM ubuntu:20.04 AS ffmpeg
RUN apt-get update && apt-get -y install curl xz-utils
COPY docker-build.sh . COPY docker-build.sh .
RUN sh ./docker-build.sh RUN sh ./docker-build.sh
FROM ubuntu:20.04 as frontend FROM ubuntu:20.04 as frontend
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get -y install \ RUN apt-get update
wget \ RUN apt-get -y install curl gnupg
gnupg && \ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ RUN apt-get -y install nodejs
apt-get -y install \
nodejs \ RUN npm install -g @angular/cli
npm && \
npm install -g @angular/cli
WORKDIR /build WORKDIR /build
COPY [ "package.json", "package-lock.json", "/build/" ] COPY [ "package.json", "package-lock.json", "/build/" ]
@@ -34,9 +33,11 @@ ENV UID=1000 \
RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER RUN groupadd -g $GID $USER && useradd --system -g $USER --uid $UID $USER
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \ RUN apt-get update && apt-get -y install curl
apt-get update && apt-get -y install \
npm \ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
RUN apt-get update && apt-get -y install \
nodejs \
python2 \ python2 \
python3 \ python3 \
atomicparsley atomicparsley

View File

@@ -4,7 +4,7 @@
# and also optimizing some code with this commit. # and also optimizing some code with this commit.
# xoxo :D # xoxo :D
set -xeuo pipefail # set -xeuo pipefail
case $(uname -m) in case $(uname -m) in
x86_64) x86_64)