style: fix Dockerfile lint issues
Signed-off-by: Vinayak Kulkarni <19776877+vinayakkulkarni@users.noreply.github.com>
This commit is contained in:
Vinayak Kulkarni
parent
793e4ac3a5
commit
83aab5daff
4 changed files with 59 additions and 40 deletions
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
|
|
@ -44,4 +44,3 @@ jobs:
|
|||
uses: hadolint/hadolint-action@v2.1.0
|
||||
with:
|
||||
dockerfile: Dockerfile
|
||||
ignore: DL3003,DL3008,DL4006,DL3015
|
||||
|
|
|
|||
8
.github/workflows/pipeline.yml
vendored
8
.github/workflows/pipeline.yml
vendored
|
|
@ -4,11 +4,9 @@ on:
|
|||
push:
|
||||
branches:
|
||||
- master
|
||||
- build/add-ci-workflow
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- build/add-ci-workflow
|
||||
|
||||
concurrency:
|
||||
group: ci-${{ github.ref }}-1
|
||||
|
|
@ -28,15 +26,15 @@ jobs:
|
|||
name: 'CI'
|
||||
needs:
|
||||
- extract-branch
|
||||
uses: vinayakkulkarni/tileserver-gl/.github/workflows/ci.yml@build/add-ci-workflow
|
||||
uses: maptiler/tileserver-gl/.github/workflows/ci.yml@master
|
||||
automerger:
|
||||
name: 'Auto Merge Bot PRs'
|
||||
needs:
|
||||
- ci
|
||||
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.user.login == 'dependabot[bot]' }}
|
||||
uses: vinayakkulkarni/tileserver-gl/.github/workflows/automerger.yml@build/add-ci-workflow
|
||||
uses: maptiler/tileserver-gl/.github/workflows/automerger.yml@master
|
||||
ct:
|
||||
name: 'CT'
|
||||
needs:
|
||||
- extract-branch
|
||||
uses: vinayakkulkarni/tileserver-gl/.github/workflows/ct.yml@build/add-ci-workflow
|
||||
uses: maptiler/tileserver-gl/.github/workflows/ct.yml@master
|
||||
|
|
|
|||
3
.hadolint.yml
Normal file
3
.hadolint.yml
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
ignored:
|
||||
- DL3008
|
||||
- DL3015
|
||||
87
Dockerfile
87
Dockerfile
|
|
@ -6,33 +6,45 @@ RUN set -ex; \
|
|||
export DEBIAN_FRONTEND=noninteractive; \
|
||||
apt-get -qq update; \
|
||||
apt-get -y --no-install-recommends install \
|
||||
build-essential \
|
||||
ca-certificates \
|
||||
wget \
|
||||
pkg-config \
|
||||
xvfb \
|
||||
libglfw3-dev \
|
||||
libuv1-dev \
|
||||
libjpeg-turbo8 \
|
||||
libicu66 \
|
||||
libcairo2-dev \
|
||||
libpango1.0-dev \
|
||||
libjpeg-dev \
|
||||
libgif-dev \
|
||||
librsvg2-dev \
|
||||
libcurl4-openssl-dev \
|
||||
libpixman-1-dev; \
|
||||
wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
|
||||
build-essential=12.8ubuntu1 \
|
||||
ca-certificates=20211016~20.04.1 \
|
||||
wget=1.20.3-1ubuntu1 \
|
||||
pkg-config=0.29.1-0ubuntu4 \
|
||||
xvfb=2:1.20.13-1ubuntu1~20.04.3 \
|
||||
libglfw3-dev=3.3.2-1 \
|
||||
libuv1-dev=1.34.2-1ubuntu1.3 \
|
||||
libjpeg-turbo8=2.0.3-0ubuntu1.20.04.3 \
|
||||
libicu66=66.1-2ubuntu2.1 \
|
||||
libcairo2-dev=1.16.0-4ubuntu1 \
|
||||
libpango1.0-dev=1.44.7-2ubuntu4 \
|
||||
libjpeg-dev=8c-2ubuntu8 \
|
||||
libgif-dev=5.1.9-1 \
|
||||
librsvg2-dev=2.48.2-1 \
|
||||
gir1.2-rsvg-2.0=2.48.2-1 \
|
||||
librsvg2-2=2.48.2-1 \
|
||||
librsvg2-common=2.48.2-1 \
|
||||
libcurl4-openssl-dev=7.68.0-1ubuntu2.13 \
|
||||
libpixman-1-dev=0.38.4-0ubuntu1; \
|
||||
apt-get -y --purge autoremove; \
|
||||
apt-get clean; \
|
||||
rm -rf /var/lib/apt/lists/*;
|
||||
|
||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
|
||||
RUN wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
|
||||
apt-get install -y nodejs; \
|
||||
npm i -g npm@latest; \
|
||||
apt-get -y remove wget; \
|
||||
apt-get -y --purge autoremove; \
|
||||
apt-get clean; \
|
||||
rm -rf /var/lib/apt/lists/*;
|
||||
|
||||
RUN mkdir -p /usr/src/app
|
||||
COPY package* /usr/src/app/
|
||||
COPY package* /usr/src/app
|
||||
|
||||
RUN cd /usr/src/app && npm ci --omit=dev
|
||||
WORKDIR /usr/src/app
|
||||
|
||||
RUN npm install --omit=dev
|
||||
|
||||
FROM ubuntu:focal AS final
|
||||
|
||||
|
|
@ -47,22 +59,29 @@ RUN set -ex; \
|
|||
useradd -r -g node node; \
|
||||
apt-get -qq update; \
|
||||
apt-get -y --no-install-recommends install \
|
||||
ca-certificates \
|
||||
wget \
|
||||
xvfb \
|
||||
libglfw3 \
|
||||
libuv1 \
|
||||
libjpeg-turbo8 \
|
||||
libicu66 \
|
||||
libcairo2 \
|
||||
libgif7 \
|
||||
libopengl0 \
|
||||
libpixman-1-0 \
|
||||
libcurl4 \
|
||||
librsvg2-2 \
|
||||
libpango1.0; \
|
||||
wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
|
||||
ca-certificates=20211016~20.04.1 \
|
||||
wget=1.20.3-1ubuntu1 \
|
||||
xvfb=2:1.20.13-1ubuntu1~20.04.3 \
|
||||
libglfw3=3.3.2-1 \
|
||||
libuv1=1.34.2-1ubuntu1.3 \
|
||||
libjpeg-turbo8=2.0.3-0ubuntu1.20.04.3 \
|
||||
libicu66=66.1-2ubuntu2.1 \
|
||||
libcairo2=1.16.0-4ubuntu1 \
|
||||
libgif7=5.1.9-1 \
|
||||
libopengl0=1.3.2-1~ubuntu0.20.04.2 \
|
||||
libpixman-1-0=0.38.4-0ubuntu1 \
|
||||
libcurl4=7.68.0-1ubuntu2.13 \
|
||||
librsvg2-2=2.48.2-1 \
|
||||
libpango-1.0-0=1.44.7-2ubuntu4; \
|
||||
apt-get -y --purge autoremove; \
|
||||
apt-get clean; \
|
||||
rm -rf /var/lib/apt/lists/*;
|
||||
|
||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
|
||||
RUN wget -qO- https://deb.nodesource.com/setup_16.x | bash; \
|
||||
apt-get install -y nodejs; \
|
||||
npm i -g npm@latest; \
|
||||
apt-get -y remove wget; \
|
||||
apt-get -y --purge autoremove; \
|
||||
apt-get clean; \
|
||||
|
|
|
|||
Loading…
Reference in a new issue