Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
POC Mirador
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IIIF
POC Mirador
Commits
d663f108
Verified
Commit
d663f108
authored
2 years ago
by
David Beniamine
Browse files
Options
Downloads
Patches
Plain Diff
Cleaner build
parent
9cdf27da
No related branches found
No related tags found
2 merge requests
!17
Resolve "Build dependencies from POC"
,
!16
Resolve "Build dependencies from POC"
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
Dockerfile
+8
-5
8 additions, 5 deletions
Dockerfile
Dockerfile.devserver
+0
-12
0 additions, 12 deletions
Dockerfile.devserver
dev.yml
+10
-1
10 additions, 1 deletion
dev.yml
docker-compose.yml
+4
-14
4 additions, 14 deletions
docker-compose.yml
with
22 additions
and
32 deletions
Dockerfile
+
8
−
5
View file @
d663f108
FROM
debian:stable
as
builder
RUN
apt-get update
&&
apt-get
install
-y
npm git
FROM
node:14
as
mirador
RUN
apt-get update
&&
apt-get
install
-y
git
COPY
. /opt
RUN
chown
-R
node:node /opt
EXPOSE
9000
WORKDIR
/opt
RUN
npm ci
USER
node
RUN
npm
install
RUN
npm run build
CMD
npm run serve
FROM
caddy:latest
as
httpd
COPY
--from=
builde
r /opt/public /srv
COPY
--from=
mirado
r /opt/public /srv
This diff is collapsed.
Click to expand it.
Dockerfile.devserver
deleted
100644 → 0
+
0
−
12
View file @
9cdf27da
#FROM debian:stable-slim
FROM node:14 as mirador
RUN apt-get update && apt-get install -y git
#RUN useradd --home-dir /opt node
RUN chown node:node /opt
EXPOSE 9000
WORKDIR /opt
USER node
# TODO other command in production
CMD npm run serve
FROM caddy:latest as httpd
This diff is collapsed.
Click to expand it.
dev.yml
+
10
−
1
View file @
d663f108
version
:
"
3.3"
services
:
mirador
:
devserver
:
build
:
context
:
.
target
:
mirador
restart
:
$DEV_RESTART
ports
:
-
$DEV_PORT:9000
environment
:
-
CORS_ALLOWED_HOSTS
-
WEBPACK_MODE=development
-
HTTP_FOLDER
-
DEV_PORT
volumes
:
-
./:/opt
httpd
:
ports
:
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
4
−
14
View file @
d663f108
version
:
"
3.3"
services
:
mirador
:
httpd
:
build
:
context
:
.
dockerfile
:
Dockerfile.devserver
target
:
mirador
restart
:
$RESTART
dockerfile
:
Dockerfile
target
:
httpd
environment
:
-
CORS_ALLOWED_HOSTS
-
HTTP_FOLDER
-
DEV_PORT
-
WEBPACK_MODE=production
volumes
:
-
$HTTP_FOLDER:/srv/data
-
./Caddyfile:/etc/caddy/Caddyfile
-
./:/opt
httpd
:
build
:
context
:
.
dockerfile
:
Dockerfile.devserver
target
:
httpd
annotot
:
image
:
tetraslibre/annotot-app
...
...
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