-
-
Notifications
You must be signed in to change notification settings - Fork 83
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #16 from acelaya/feature/0.1.1
Feature/0.1.1
- Loading branch information
Showing
6 changed files
with
78 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
./build | ||
./dist | ||
./node_modules | ||
./test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# CHANGELOG | ||
|
||
## 0.1.1 - 2018-08-06 | ||
|
||
#### Added | ||
|
||
* [#15](https://github.com/shlinkio/shlink-web-client/issues/15) Added a `Dockerfile` that can be used to generate a distributable docker image | ||
|
||
#### Changed | ||
|
||
* *Nothing* | ||
|
||
#### Deprecated | ||
|
||
* *Nothing* | ||
|
||
#### Removed | ||
|
||
* *Nothing* | ||
|
||
#### Fixed | ||
|
||
* *Nothing* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,21 @@ | ||
FROM node:10.4.1-alpine | ||
FROM nginx:1.15.2-alpine | ||
MAINTAINER Alejandro Celaya <alejandro@alejandrocelaya.com> | ||
|
||
# Install yarn | ||
RUN apk add --no-cache --virtual yarn | ||
# Install node and yarn | ||
RUN apk add --no-cache --virtual nodejs && apk add --no-cache --virtual yarn | ||
|
||
# Make home dir writable by anyone | ||
RUN chmod 777 /home | ||
ADD . ./shlink-web-client | ||
|
||
CMD cd /home/shlink/www && \ | ||
# Install dependencies and build project | ||
RUN cd ./shlink-web-client && \ | ||
yarn install && \ | ||
yarn start | ||
yarn build && \ | ||
|
||
# Move build contents to document root | ||
cd .. && \ | ||
rm -r /usr/share/nginx/html/* && \ | ||
mv ./shlink-web-client/build/* /usr/share/nginx/html && \ | ||
rm -r ./shlink-web-client && \ | ||
|
||
# Delete and uninstall build tools | ||
yarn cache clean && apk del yarn && apk del nodejs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
version: '3' | ||
|
||
services: | ||
shlink_web_client_node: | ||
user: 1000:1000 | ||
volumes: | ||
- /etc/passwd:/etc/passwd:ro | ||
- /etc/group:/etc/group:ro | ||
shlink_web_client_node: | ||
user: 1000:1000 | ||
volumes: | ||
- /etc/passwd:/etc/passwd:ro | ||
- /etc/group:/etc/group:ro |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,12 @@ | ||
version: '3' | ||
|
||
services: | ||
shlink_web_client_node: | ||
container_name: shlink_web_client_node | ||
build: | ||
context: . | ||
dockerfile: ./Dockerfile | ||
volumes: | ||
- ./:/home/shlink/www | ||
ports: | ||
- "3000:3000" | ||
- "56745:56745" | ||
shlink_web_client_node: | ||
container_name: shlink_web_client_node | ||
image: node:10.4.1-alpine | ||
command: /bin/sh -c "cd /home/shlink/www && yarn install && yarn start" | ||
volumes: | ||
- ./:/home/shlink/www | ||
ports: | ||
- "3000:3000" | ||
- "56745:56745" |