Skip to content

fix(Dockerfile): jekyll install #30

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

Merged
tevariou merged 9 commits into from
Dec 29, 2021
Merged

fix(Dockerfile): jekyll install #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cdbc113
fix(Dockerfile): jekyll install
tevariou Dec 8, 2021
bdfafff
fix: updatePublisher os type check
tevariou Dec 8, 2021
1a3e2f9
fix: rights on shell scripts
tevariou Dec 8, 2021
fab09ca
fix: give exec right on scripts
tevariou Dec 8, 2021
170e495
chore: rm .idea folder
tevariou Dec 8, 2021
a033807
fix: jekyll user
tevariou Dec 8, 2021
ee56f07
fix(dockerfile): make jekyll owner of build folder
tevariou Dec 8, 2021
546b53e
chore: rm yarn.lock
tevariou Dec 9, 2021
d8b2c0b
refactor(dockerfile): run updatePublisher before copy
tevariou Dec 9, 2021
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
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ temp
template
.DS_Store
*.zip
node_modules
node_modules

.idea
31 changes: 17 additions & 14 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,32 @@
FROM jruby:9.2.18.0-jdk11 as build-image
FROM alpine:3.13 as build-image

RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y build-essential npm \
&& apt-get install -y iputils-ping \
&& apt-get autoremove --purge -y \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /build

RUN apk update \
&& apk upgrade \
&& apk add --no-cache \
build-base \
npm \
curl \
iputils \
ruby-full \
ruby-dev \
openjdk8 \
bash

RUN gem install jekyll

RUN npm install -g fsh-sushi

WORKDIR /build

COPY _updatePublisher_curl.sh _updatePublisher_curl.sh
COPY _genonce.sh _genonce.sh
RUN ./_updatePublisher_curl.sh -y

COPY input input
COPY ig.ini ig.ini
COPY sushi-config.yaml sushi-config.yaml
COPY package-list.json package-list.json

RUN ./_updatePublisher_curl.sh -y || echo "ok"

RUN chmod +x _genonce.sh
RUN ./_genonce.sh -y

FROM alpine:3.13
Expand All @@ -35,4 +38,4 @@ RUN chmod +x /app/docker-entrypoint.sh

COPY --from=build-image /build /app

ENTRYPOINT ["/app/docker-entrypoint.sh"]
ENTRYPOINT ["/app/docker-entrypoint.sh"]
2 changes: 1 addition & 1 deletion _updatePublisher.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ done

echo "Checking internet connection"
case "$OSTYPE" in
linux-gnu* ) ping tx.fhir.org -4 -c 1 -w 1000 >/dev/null ;;
linux* ) ping tx.fhir.org -4 -c 1 -w 1000 >/dev/null ;;
darwin* ) ping tx.fhir.org -c 1 >/dev/null ;;
*) echo "unknown: $OSTYPE"; exit 1 ;;
esac
Expand Down
2 changes: 1 addition & 1 deletion _updatePublisher_curl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ done

echo "Checking internet connection"
case "$OSTYPE" in
linux-gnu* ) curl -sSf tx.fhir.org > /dev/null ;;
linux* ) curl -sSf tx.fhir.org > /dev/null ;;
darwin* ) ping tx.fhir.org -c 1 >/dev/null ;;
*) echo "unknown: $OSTYPE"; exit 1 ;;
esac
Expand Down