Skip to content

Commit 199f613

Browse files
homerrhomerr
authored
Merge pull request #1 from sparklyballs/fixes_n_stuff
Dockerfile rewrite change file perms and add ancillary files
2 parents 2735bcb + 462b12f commit 199f613

File tree

11 files changed

+253
-19
lines changed

11 files changed

+253
-19
lines changed

‎.dockerignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.git
2+
.gitignore
3+
.github
4+
.gitattributes
5+
READMETEMPLATE.md
6+
README.md

‎.gitattributes

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
# Custom for Visual Studio
5+
*.cs diff=csharp
6+
7+
# Standard to msysgit
8+
*.doc diff=astextplain
9+
*.DOC diff=astextplain
10+
*.docx diff=astextplain
11+
*.DOCX diff=astextplain
12+
*.dot diff=astextplain
13+
*.DOT diff=astextplain
14+
*.pdf diff=astextplain
15+
*.PDF diff=astextplain
16+
*.rtf diff=astextplain
17+
*.RTF diff=astextplain

‎.github/ISSUE_TEMPLATE.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!--- Provide a general summary of the issue in the Title above -->
2+
3+
[linuxserverurl]: https://linuxserver.io
4+
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
5+
6+
7+
<!--- If you have an issue with the project, please provide us with the following information -->
8+
9+
<!--- Host OS -->
10+
<!--- Command line users, your run/create command, GUI/Unraid users, a screenshot of your template settings. -->
11+
<!--- Docker log output, docker log <container-name> -->
12+
<!--- Mention if you're using symlinks on any of the volume mounts. -->
13+
14+
15+
<!--- If you have a suggestion or fix for the project, please provide us with the following information -->
16+
17+
<!--- What you think your suggestion brings to the project, or fixes with the project -->
18+
<!--- If it's a fix, would it be better suited as a Pull request to the repo ? -->
19+
20+
## Thanks, team linuxserver.io
21+

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<!--- Provide a general summary of your changes in the Title above -->
2+
3+
[linuxserverurl]: https://linuxserver.io
4+
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
5+
6+
7+
<!--- Before submitting a pull request please check the following -->
8+
9+
<!--- That you have made a branch in your fork, we'd rather not merge from your master -->
10+
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
11+
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
12+
<!--- -->
13+
14+
## Thanks, team linuxserver.io
15+

‎.gitignore

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# Windows image file caches
2+
Thumbs.db
3+
ehthumbs.db
4+
5+
# Folder config file
6+
Desktop.ini
7+
8+
# Recycle Bin used on file shares
9+
$RECYCLE.BIN/
10+
11+
# Windows Installer files
12+
*.cab
13+
*.msi
14+
*.msm
15+
*.msp
16+
17+
# Windows shortcuts
18+
*.lnk
19+
20+
# =========================
21+
# Operating System Files
22+
# =========================
23+
24+
# OSX
25+
# =========================
26+
27+
.DS_Store
28+
.AppleDouble
29+
.LSOverride
30+
31+
# Thumbnails
32+
._*
33+
34+
# Files that might appear on external disk
35+
.Spotlight-V100
36+
.Trashes
37+
38+
# Directories potentially created on remote AFP share
39+
.AppleDB
40+
.AppleDesktop
41+
Network Trash Folder
42+
Temporary Items
43+
.apdisk

‎Dockerfile

100755100644
Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:3.7
1+
FROM lsiobase/alpine:3.8
22

33
# set version label
44
ARG BUILD_DATE
@@ -12,37 +12,44 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
1212
RUN \
1313
echo "**** install build packages ****" && \
1414
apk add --no-cache --virtual=build-dependencies \
15-
build-base \
1615
curl \
16+
g++ \
17+
gcc \
1718
libsass-dev \
19+
make \
1820
nodejs-npm \
19-
tar \
20-
python && \
21+
python \
22+
tar && \
2123
echo "**** install runtime packages ****" && \
2224
apk add --no-cache \
2325
nodejs && \
26+
echo "**** update npm and install node dependencies ****" && \
27+
npm install -g \
28+
gulp-cli \
29+
npm@latest \
30+
pm2 && \
2431
echo "**** install raneto ****" && \
2532
mkdir -p \
2633
/app/raneto && \
27-
RANETO_VER="$(curl -sX GET https://api.github.com/repos/gilbitron/Raneto/releases/latest | grep 'tag_name' | cut -d\" -f4)" && \
34+
RANETO_VER=$(curl -sX GET "https://api.github.com/repos/gilbitron/Raneto/releases/latest" \
35+
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
2836
curl -o \
29-
/tmp/raneto-src.tar.gz -L \
37+
/tmp/raneto-src.tar.gz -L \
3038
"https://github.com/gilbitron/Raneto/archive/${RANETO_VER}.tar.gz" && \
31-
tar xf \
32-
/tmp/raneto-src.tar.gz -C \
39+
tar xf \
40+
/tmp/raneto-src.tar.gz -C \
3341
/app/raneto --strip-components=1 && \
34-
cd /app/raneto && \
35-
36-
echo "**** install raneto node dev modules and build ****" && \
37-
npm config set unsafe-perm true && \
38-
npm install && \
39-
40-
echo "**** cleanup ****" && \
41-
apk del --purge build-dependencies && \
42-
rm -rf \
42+
cd /app/raneto && \
43+
echo "**** install raneto node dev modules and build ****" && \
44+
npm install && \
45+
gulp && \
46+
echo "**** cleanup ****" && \
47+
apk del --purge \
48+
build-dependencies && \
49+
rm -rf \
4350
/root \
4451
/tmp/* && \
45-
mkdir -p \
52+
mkdir -p \
4653
/root
4754

4855
# copy local files

‎README.md

100755100644
Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,15 @@
1-
# docker-raneto
1+
[linuxserverurl]: https://linuxserver.io
2+
[forumurl]: https://forum.linuxserver.io
3+
[ircurl]: https://www.linuxserver.io/irc/
4+
[podcasturl]: https://www.linuxserver.io/podcast/
5+
6+
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
7+
8+
## This is a Container in active development by the [LinuxServer.io][linuxserverurl] team and is not recommended for use by the general public.
9+
10+
If you want to comment\contribute on this container , are looking for support on any of our other work , or are curious about us in general, check out the following.
11+
12+
* [forum.linuxserver.io][forumurl]
13+
* [IRC][ircurl] on freenode at `#linuxserver.io`
14+
* [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
15+

‎READMETEMPLATE.md

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
[linuxserverurl]: https://linuxserver.io
2+
[forumurl]: https://forum.linuxserver.io
3+
[ircurl]: https://www.linuxserver.io/irc/
4+
[appurl]: www.example.com
5+
[dockerfileurl]: https://github.com/linuxserver/docker-<container-name>/blob/master/Dockerfile
6+
[hub]: https://hub.docker.com/r/<image-name>/
7+
8+
9+
10+
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png?v=4&s=4000)][linuxserverurl]
11+
12+
13+
## Contact information:-
14+
15+
| Type | Address/Details |
16+
| :---: | --- |
17+
| Discord | [Discord](https://discord.gg/YWrKVTn) |
18+
| IRC | freenode at `#linuxserver.io` more information at:- [IRC][ircurl]
19+
| Forum | [Linuserver.io forum][forumurl] |
20+
21+
&nbsp;
22+
&nbsp;
23+
24+
The [LinuxServer.io][linuxserverurl] team brings you another image release featuring :-
25+
26+
+ regular and timely application updates
27+
+ easy user mappings
28+
+ custom base image with s6 overlay
29+
+ weekly base OS updates with common layers across the entire LinuxServer.io ecosystem to minimise space usage, down time and bandwidth
30+
+ security updates
31+
32+
# <image-name>
33+
34+
[![Dockerfile-link](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Link-green.png)][dockerfileurl]
35+
36+
Provide a short, concise description of the application. No more than two SHORT paragraphs. Link to sources where possible and include an image illustrating your point if necessary. Point users to the original applications website, as that's the best place to get support - not here.
37+
38+
`IMPORTANT, replace all instances of <image-name> with the correct dockerhub repo (ie linuxserver/plex) and <container-name> information (ie, plex) and make sure to update the block at the top of this file containing app specific urls, dockerhub url and dockerfile url etc.`
39+
40+
&nbsp;
41+
42+
## Usage
43+
44+
```
45+
docker create \
46+
--name=<container-name> \
47+
-v <path to data>:/config \
48+
-e PGID=<gid> -e PUID=<uid> \
49+
-p 1234:1234 \
50+
<image-name>
51+
```
52+
53+
&nbsp;
54+
55+
## Parameters
56+
57+
The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side.
58+
For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container.
59+
So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080
60+
http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.
61+
62+
63+
64+
| Parameter | Function |
65+
| :---: | --- |
66+
| `-p 1234` | the port(s) |
67+
| `-v /config` | explain what lives here |
68+
| `-e PGID` | for GroupID, see below for explanation |
69+
| `-e PUID` | for UserID, see below for explanation |
70+
71+
&nbsp;
72+
73+
## User / Group Identifiers
74+
75+
Sometimes when using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
76+
77+
Ensure any volume directories on the host are owned by the same user you specify and it will "just work" &trade;.
78+
79+
In this instance `PUID=1001` and `PGID=1001`, to find yours use `id user` as below:
80+
81+
```
82+
$ id <dockeruser>
83+
uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
84+
```
85+
86+
&nbsp;
87+
88+
## Setting up the application
89+
90+
Insert a basic user guide here to get a n00b up and running with the software inside the container. DELETE ME
91+
92+
93+
&nbsp;
94+
95+
## Container access and information.
96+
97+
| Function | Command |
98+
| :--- | :--- |
99+
| Shell access (live container) | `docker exec -it <container-name> /bin/bash` |
100+
| Realtime container logs | `docker logs -f <container-name>` |
101+
| Container version | `docker inspect -f '{{ index .Config.Labels "build_version" }}' <container-name>` |
102+
| Image version | `docker inspect -f '{{ index .Config.Labels "build_version" }}' <image-name>` |
103+
| Dockerfile | [Dockerfile][dockerfileurl] |
104+
105+
&nbsp;
106+
107+
## Changelog
108+
109+
| Date | Changes |
110+
| :---: | --- |
111+
| dd.MM.yy | Initial Release. |

‎root/defaults/config.default.js

100755100644
File mode changed.

‎root/etc/cont-init.d/30-config

100755100644
File mode changed.

‎root/etc/services.d/raneto/run

100755100644
File mode changed.

0 commit comments

Comments
 (0)