Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
docker
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
erdnaxe
docker
Commits
72a78c83
Commit
72a78c83
authored
Oct 07, 2019
by
erdnaxe
🎇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use officiel Riot docker image
parent
f441d8e4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
31 deletions
+3
-31
riot/Dockerfile
riot/Dockerfile
+0
-24
riot/docker-compose.yml
riot/docker-compose.yml
+3
-7
No files found.
riot/Dockerfile
deleted
100644 → 0
View file @
f441d8e4
FROM
nginx:alpine
ARG
version
ARG
gpg_key
# Download Riot Web, verify with GPG, then install
RUN
apk add
--no-cache
--virtual
.build-deps curl gnupg
&&
\
curl
-sSL
https://github.com/vector-im/riot-web/releases/download/
${
version
}
/riot-
${
version
}
.tar.gz
-o
riot-web.tar.gz
&&
\
curl
-sSL
https://github.com/vector-im/riot-web/releases/download/
${
version
}
/riot-
${
version
}
.tar.gz.asc
-o
riot-web.tar.gz.asc
&&
\
for
server
in
\
hkp://keyserver.ubuntu.com:80
\
hkp://p80.pool.sks-keyservers.net:80
\
ha.pool.sks-keyservers.net
\
;
do
\
echo
"Fetching GPG key
$gpg_key
from
$server
"
;
\
gpg
--keyserver
"
$server
"
--keyserver-options
timeout
=
10
--recv-keys
"
$gpg_key
"
&&
break
;
\
done
&&
\
gpg --batch --verify riot-web.tar.gz.asc riot-web.tar.gz &&\
tar -xzf riot-web.tar.gz &&\
mv riot-${version} /etc/riot-web &&\
cp /etc/riot-web/config.sample.json /etc/riot-web/config.json &&\
rm -rf /usr/share/nginx/html && ln -s /etc/riot-web /usr/share/nginx/html &&\
rm riot-web.tar.gz* &&\
apk del .build-deps
riot/docker-compose.yml
View file @
72a78c83
...
...
@@ -2,14 +2,10 @@ version: "3.7"
services
:
riot
:
build
:
context
:
.
args
:
version
:
v1.3.6
gpg_key
:
5EA7E0F70461A3BCBEBE4D5EF6151806032026F9
image
:
vectorim/riot-web
volumes
:
# Make Riot default to
auro.re
matrix server
-
./config.json:/
etc/riot-web
/config.json:ro
# Make Riot default to
our
matrix server
-
./config.json:/
app
/config.json:ro
ports
:
-
8080:80
restart
:
always
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment