Skip to content

Commit b8b3290

Browse files
authored
fix dockerfile (jhipster#1387)
* fix dockerfile * fix workflow
1 parent 2d4f888 commit b8b3290

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

.github/workflows/build-docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v3
1414
- name: Build docker image
15-
run: docker build -t jhipster/jhipster-dotnetcore:test-build ./docker/
15+
run: docker build -t jhipster/jhipster-dotnetcore:test-build .
1616
- name: Check if docker image exists and remove it
1717
run: |
1818
imageId=$(docker images -q jhipster/jhipster-dotnetcore:test-build)

docker/Dockerfile renamed to Dockerfile

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
2+
3+
# copy sources
4+
COPY . /home/jhipster/jhipster-dotnetcore
5+
26
RUN \
37
# configure the "jhipster" user
48
groupadd jhipster && \
@@ -15,12 +19,14 @@ RUN \
1519
sudo \
1620
git && \
1721
# install node.js
18-
wget https://nodejs.org/dist/v14.17.3/node-v14.17.3-linux-x64.tar.gz -O /tmp/node.tar.gz && \
22+
wget https://nodejs.org/dist/v18.17.1/node-v18.17.1-linux-x64.tar.gz -O /tmp/node.tar.gz && \
1923
tar -C /usr/local --strip-components 1 -xzf /tmp/node.tar.gz && \
2024
# upgrade npm
2125
npm install -g npm && \
2226
# install yeoman
2327
npm install -g yo && \
28+
#install dotnet
29+
apt-get install -y dotnet-sdk-7.0 && \
2430
# cleanup
2531
apt-get clean && \
2632
rm -rf \
@@ -30,10 +36,8 @@ RUN \
3036
/var/tmp/*
3137

3238
RUN \
33-
# install jhipster
34-
npm install -g generator-jhipster && \
3539
# install the blueprint
36-
npm install -g generator-jhipster-dotnetcore && \
40+
npm install -g /home/jhipster/jhipster-dotnetcore && \
3741
# fix jhipster user permissions
3842
chown -R jhipster:jhipster \
3943
/home/jhipster \
@@ -50,4 +54,4 @@ USER jhipster
5054
ENV PATH $PATH:/usr/bin
5155
WORKDIR "/home/jhipster/app"
5256
VOLUME ["/home/jhipster/app"]
53-
CMD ["jhipster", "--blueprints", "dotnetcore"]
57+
CMD ["jhipster-dotnetcore"]

0 commit comments

Comments
 (0)