Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
datacirco-prepare-data
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
leximpact
DataCirco
datacirco-prepare-data
Commits
c2827328
Commit
c2827328
authored
Jan 26, 2024
by
Benoît Courty
Browse files
Options
Downloads
Patches
Plain Diff
Maj image Docker
parent
d2fae22f
No related branches found
No related tags found
1 merge request
!25
Ajout du chapitre éducation
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker-compose.yml
+3
-2
3 additions, 2 deletions
docker-compose.yml
docker/Dockerfile
+2
-10
2 additions, 10 deletions
docker/Dockerfile
with
5 additions
and
12 deletions
docker-compose.yml
+
3
−
2
View file @
c2827328
...
...
@@ -5,7 +5,7 @@ services:
# build:
# context: .
# dockerfile: ./docker/Dockerfile
image
:
leximpact/datacirco:1.
0
.0
image
:
leximpact/datacirco:1.
1
.0
networks
:
-
leximpact_net
environment
:
...
...
@@ -26,7 +26,7 @@ services:
POSTGRES_DB
:
${DATABASE_NAME:-infocirco}
POSTGRES_PASSWORD
:
${DATABASE_PASS:-datacirco}
POSTGRES_USER
:
${DATABASE_USER:-datacirco}
image
:
postgis/postgis:1
4
-master
image
:
postgis/postgis:1
5
-master
networks
:
-
leximpact_net
ports
:
...
...
@@ -34,6 +34,7 @@ services:
restart
:
unless-stopped
volumes
:
-
postgres_data:/var/lib/postgresql/data:rw
-
/tmp:/tmp/backup:ro
pgadmin
:
container_name
:
pgadmin_datacirco
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile
+
2
−
10
View file @
c2827328
FROM
python:3.
9
-slim
FROM
python:3.
11
-slim
WORKDIR
/opt
ENV
TZ=Europe/Paris
RUN
ln
-snf
/usr/share/zoneinfo/
$TZ
/etc/localtime
&&
echo
$TZ
>
/etc/timezone
RUN
apt-get update
&&
apt-get
-y
install
libpython3.9-dev gcc zip gnupg2 wget nano git curl csvkit libcairo2-dev pkg-config p7zip-full jq gdal-bin parallel postgresql-client texlive-xetex optipng imagemagick-6.q16hdri texlive-lang-french recode
# python3.8-venv python3-wheel python3-pip python3-dev
# Add pgf-pie to Latex
RUN
tlmgr init-usertree
RUN
mkdir
-p
/root/texmf/tex/generic
&&
cd
/root/texmf/tex/generic
&&
wget
-q
https://mirrors.ctan.org/graphics/pgf/contrib/pgf-pie.zip
&&
unzip pgf-pie.zip
-x
pgf-pie/demo/
*
&&
rm
pgf-pie.zip
RUN
apt-get update
&&
apt-get
-y
install
gcc gnupg2 wget nano git curl csvkit p7zip-full jq optipng imagemagick-6.q16hdri patool ghostscript python3-cairo libcairo2-dev gdal-bin zip
# Configure convert
RUN
sed
-i
'/PDF/d'
/etc/ImageMagick-6/policy.xml
...
...
@@ -22,8 +17,5 @@ RUN poetry config virtualenvs.create false
COPY
pyproject.toml poetry.lock README.md ./
RUN
poetry
install
--no-interaction
--no-ansi
#COPY entrypoint.sh .
#RUN chmod a+x entrypoint.sh
# Infinite run
ENTRYPOINT
["tail", "-f", "/dev/null"]
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