Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ubl
amsl
Deployment
Images
okapi
Commits
54f4e509
Commit
54f4e509
authored
Jul 15, 2019
by
Steffen Köhler
Browse files
Merge branch 'to-2.30.1' into 'master'
To 2.30.1 See merge request
!2
parents
bc6f88e7
cb0136e8
Pipeline
#2837
failed with stages
in 2 minutes and 1 second
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
54f4e509
...
...
@@ -31,8 +31,6 @@ docker_build:
changes
:
-
Dockerfile
-
assets/*
refs
:
-
/^release\/.*/
docker_publish_alpha
:
stage
:
publish
...
...
@@ -44,7 +42,8 @@ docker_publish_alpha:
--input image.tar.gz \
--docker-config "${DOCKER_ALPHA_AUTH_CONFIG}" \
--name ${alpha_repo} \
--tag ${CI_COMMIT_REF_SLUG}
--tag ${CI_COMMIT_REF_SLUG} \
--tag alpha
dependencies
:
-
docker_build
tags
:
...
...
Dockerfile
View file @
54f4e509
FROM
folioorg/okapi:2.
27.0
FROM
folioorg/okapi:2.
30.1
EXPOSE
9130
ENTRYPOINT
["/docker-entrypoint"]
CMD
[ "dev" ]
...
...
docker-compose.yml
View file @
54f4e509
...
...
@@ -20,6 +20,7 @@ services:
image
:
postgres:11-alpine
volumes
:
-
pg-data:/var/lib/postgresql/data/pgdata
-
./docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
environment
:
PGDATA
:
/var/lib/postgresql/data/pgdata
POSTGRES_DB
:
okapi
...
...
docker-entrypoint-initdb.d/init.sql
0 → 100644
View file @
54f4e509
CREATE
USER
folio
with
createrole
encrypted
password
'myVerySecret'
;
CREATE
DATABASE
folio_modules
with
owner
=
folio
;
\
c
folio_modules
CREATE
EXTENSION
IF
NOT
EXISTS
pgcrypto
WITH
SCHEMA
public
;
CREATE
EXTENSION
IF
NOT
EXISTS
unaccent
WITH
SCHEMA
public
;
CREATE
EXTENSION
IF
NOT
EXISTS
pg_trgm
WITH
SCHEMA
public
;
\ No newline at end of file
Write
Preview
Supports
Markdown
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