Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Dockerfiles
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Picasoft
Technique
Dockerfiles
Commits
d2529101
Commit
d2529101
authored
5 years ago
by
Romain de Laage
Browse files
Options
Downloads
Patches
Plain Diff
use init in docker-compose instead of tini + env file
parent
0c1b81b8
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+1
-6
1 addition, 6 deletions
Dockerfile
docker-compose.yml
+4
-6
4 additions, 6 deletions
docker-compose.yml
with
5 additions
and
12 deletions
Dockerfile
+
1
−
6
View file @
d2529101
...
...
@@ -2,22 +2,17 @@ FROM debian:buster
ARG
LUFI_BUILD_VERSION=0.04.6
ARG
TINI_BUILD_VERSION=v0.18.0
RUN
apt-get update
\
&&
apt-get
-yq
install
build-essential libssl-dev libio-socket-ssl-perl liblwp-protocol-https-perl libpq-dev wget unzip
\
&&
apt-get clean
&&
cpan Carton
\
&&
wget https://github.com/ldidry/lufi/archive/
${
LUFI_BUILD_VERSION
}
.zip
&&
unzip
${
LUFI_BUILD_VERSION
}
.zip
\
&&
wget https://github.com/krallin/tini/releases/download/
${
TINI_BUILD_VERSION
}
/tini-amd64
&&
mv
tini-amd64 tini
\
&&
rm
${
LUFI_BUILD_VERSION
}
.zip
&&
mv
lufi-
${
LUFI_BUILD_VERSION
}
lufi
COPY
lufi.conf /lufi/lufi.conf
WORKDIR
/lufi
RUN
carton
install
--deployment
--without
=
test
--without
=
sqlite
--without
=
mysql
&&
chmod
+x /tini
ENTRYPOINT
["/tini", "--"]
RUN
carton
install
--deployment
--without
=
test
--without
=
sqlite
--without
=
mysql
CMD
["carton", "exec", "hypnotoad", "-f", "/lufi/script/lufi"]
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
4
−
6
View file @
d2529101
version
:
'
3'
version
:
"
3.7"
volumes
:
lufidb-data
:
...
...
@@ -10,17 +10,15 @@ services:
image
:
postgres:12
container_name
:
lufidb
restart
:
always
# env_file:
# - lufi.env
environment
:
-
POSTGRES_USER=lufidb
-
POSTGRES_PASSWORD=passwd
env_file
:
-
lufi.env
volumes
:
-
lufidb-data:/var/lib/postgresql/data
lufi
:
image
:
lufi
container_name
:
lufi
init
:
true
depends_on
:
-
lufidb
ports
:
...
...
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