Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
Docker Dachs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VirtualObservatory
Docker Dachs
Commits
7c92dff5
Commit
7c92dff5
authored
8 years ago
by
Carlos Brandt
Browse files
Options
Downloads
Patches
Plain Diff
Removed the dachs.sh entrypoint.
Also, changed from debian to ubuntu 'cause problems with mirrors/version.
parent
42aa7236
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
dockerfile/Dockerfile
+13
-12
13 additions, 12 deletions
dockerfile/Dockerfile
with
13 additions
and
12 deletions
dockerfile/Dockerfile
+
13
−
12
View file @
7c92dff5
FROM
debian:jessie
FROM
ubuntu:trusty
LABEL
Description=DaCHS\ is\ a\ publishing\ infrastructure\ for\ the\ Virtual\ Observatory. \
Author=Markus\ Demleitner \
...
...
@@ -16,25 +16,25 @@ RUN apt-get update && \
# This is the brute-force solution for Debian;
# I am having problems in set locales non-interactively,
# and since I really need the "C/UTF8" for postgres, will just set it for all.
ENV
LC_ALL C.UTF-8
RUN
echo
LC_ALL
=
"
$LC_ALL
"
>
/etc/default/locale
#
ENV LC_ALL C.UTF-8
#
RUN echo LC_ALL="$LC_ALL" > /etc/default/locale
# I'll leave the lines below for further look;
# These work just find under Ubuntu.
# (Yeah, I'll remove these lines in the near future...probably...)
#
ENV LANG en_US.UTF-8
#
ENV LANGUAGE en_US:en
#
ENV LC_CTYPE C.UTF-8
#
RUN locale-gen --purge $LANG && \
#
echo LANG="$LANG" > /etc/default/locale && \
#
echo LANGUAGE="$LANGUAGE" >> /etc/default/locale && \
#
echo LC_CTYPE="$LC_CTYPE" >> /etc/default/locale
ENV
LANG en_US.UTF-8
ENV
LANGUAGE en_US:en
ENV
LC_CTYPE C.UTF-8
RUN
locale-gen
--purge
$LANG
&&
\
echo
LANG
=
"
$LANG
"
>
/etc/default/locale
&&
\
echo
LANGUAGE
=
"
$LANGUAGE
"
>>
/etc/default/locale
&&
\
echo
LC_CTYPE
=
"
$LC_CTYPE
"
>>
/etc/default/locale
RUN
echo
'deb http://vo.ari.uni-heidelberg.de/debian stable main'
>
/etc/apt/sources.list.d/gavo.list
&&
\
echo
'deb-src http://vo.ari.uni-heidelberg.de/debian stable main'
>>
/etc/apt/sources.list.d/gavo.list
&&
\
wget
-qO
- http://docs.g-vo.org/archive-key.asc | apt-key add -
RUN
echo
'deb http://apt.postgresql.org/pub/repos/apt/
jessie
-pgdg main'
>
/etc/apt/sources.list.d/pgdg.list
&&
\
RUN
echo
'deb http://apt.postgresql.org/pub/repos/apt/
trusty
-pgdg main'
>
/etc/apt/sources.list.d/pgdg.list
&&
\
wget
--quiet
-O
- https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
RUN
sed
-i
's/exit 101/exit 0/'
/usr/sbin/policy-rc.d
...
...
@@ -48,4 +48,5 @@ COPY etc/gavo.rc /etc/gavo.rc
COPY
bin/dachs.sh /dachs.sh
EXPOSE
8080
ENTRYPOINT
["/dachs.sh"]
#ENTRYPOINT ["/dachs.sh"]
ENTRYPOINT
["/bin/bash"]
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment