Skip to content

Commit e40f317

Browse files
committed
update to latest images
1 parent 9205210 commit e40f317

4 files changed

Lines changed: 56 additions & 15 deletions

File tree

docker-compose/docker-compose-graphdb.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ services:
2929
- 7200:7200
3030

3131
minio-server:
32-
image: minio/minio:RELEASE.2022-05-26T05-48-41Z.hotfix.15f13935a
32+
image: quay.io/minio/minio
3333
hostname: minio-server
3434
container_name: minio-server
3535
environment:
36-
- MINIO_ACCESS_KEY=admintest
37-
- MINIO_SECRET_KEY=admintest
36+
- MINIO_ROOT_USER=admintest
37+
- MINIO_ROOT_PASSWORD=admintest
3838
command: server /tmp/data
3939
ports:
4040
- 9000:9000
@@ -53,7 +53,7 @@ services:
5353
- 8082:8080
5454

5555
store-service:
56-
image: openmbee/flexo-mms-store-service:latest
56+
image: openmbee/flexo-mms-store-service:develop-SNAPSHOT
5757
hostname: store-service
5858
container_name: store-service
5959
env_file:

docker-compose/docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ services:
3131
- 3030:3030
3232

3333
minio-server:
34-
image: minio/minio:RELEASE.2022-05-26T05-48-41Z.hotfix.15f13935a
34+
image: quay.io/minio/minio
3535
hostname: minio-server
3636
container_name: minio-server
3737
environment:
38-
- MINIO_ACCESS_KEY=admintest
39-
- MINIO_SECRET_KEY=admintest
38+
- MINIO_ROOT_USER=admintest
39+
- MINIO_ROOT_PASSWORD=admintest
4040
command: server /tmp/data
4141
ports:
4242
- 9000:9000
@@ -55,7 +55,7 @@ services:
5555
- 8082:8080
5656

5757
store-service:
58-
image: openmbee/flexo-mms-store-service:latest
58+
image: openmbee/flexo-mms-store-service:develop-SNAPSHOT
5959
hostname: store-service
6060
container_name: store-service
6161
env_file:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
S3_ENDPOINT=http://minio-server:9000
2-
S3_REGION=somewhere
2+
S3_REGION=us-east-1
33
AWS_ACCESS_KEY_ID=admintest
44
AWS_SECRET_ACCESS_KEY=admintest

docker-compose/mount/cluster.trig

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ graph m-graph:AccessControl.Agents {
2121
m-user:anon a mms:User ;
2222
mms:id "anon" .
2323

24-
<http://layer1-service/users/ldap/user/user01> a mms:User ;
24+
<http://layer1-service/users/ldap/user/user01> a mms:User ;
2525
mms:id "ldap/user/user01" .
2626

2727
<http://layer1-service/users/ldap/user/user02> a mms:User ;
@@ -31,7 +31,8 @@ graph m-graph:AccessControl.Agents {
3131
mms:id "ldap/group/group01" .
3232

3333
m-group:SuperAdmins a mms:Group ;
34-
mms:id "super_admins" .
34+
mms:id "super_admins" ;
35+
mms:etag "mms-init-etag-value-group-SuperAdmins" .
3536
}
3637

3738
# default policies
@@ -80,6 +81,9 @@ graph m-graph:Schema {
8081
rdfs:label "InterimLock" ;
8182
rdfs:subClassOf mms:Lock .
8283

84+
mms:Artifact a rdfs:Class ;
85+
rdfs:label "Artifact" .
86+
8387
mms:Snapshot a rdfs:Class ;
8488
rdfs:label "Snapshot" .
8589

@@ -146,12 +150,16 @@ graph m-graph:AccessControl.Definitions {
146150
mms:Repo a rdfs:Class ;
147151
rdfs:label "Repo level scope" ;
148152
rdfs:subClassOf mms:Scope ;
149-
mms:implies mms:Ref .
153+
mms:implies mms:Ref, mms:Artifact, mms:Commit .
150154

151155
mms:Collection a rdfs:Class ;
152156
rdfs:label "Collection level scope" ;
153157
rdfs:subClassOf mms:Scope .
154158

159+
mms:Artifact a rdfs:Class ;
160+
rdfs:label "Artifact level scope" ;
161+
rdfs:subClassOf mms:Scope .
162+
155163
mms:Ref a rdfs:Class ;
156164
rdfs:label "Ref level scope" ;
157165
rdfs:subClassOf mms:Scope ;
@@ -229,10 +237,20 @@ graph m-graph:AccessControl.Definitions {
229237
mms-object:Permission.ReadRepo a mms:Permission .
230238

231239
mms-object:Permission.UpdateRepo a mms:Permission ;
232-
mms:implies mms-object:Permission.ReadRepo .
240+
mms:implies mms-object:Permission.ReadRepo, mms-object:Permission.ReadCommit, mms-object:Permission.UpdateBranch, mms-object:Permission.UpdateLock, mms-object:Permission.UpdateCommit, mms-object:Permission.UpdateRef .
233241

234242
mms-object:Permission.DeleteRepo a mms:Permission ;
235-
mms:implies mms-object:Permission.UpdateRepo, mms-object:Permission.CreateBranch, mms-object:Permission.DeleteBranch, mms-object:Permission.CreateLock, mms-object:Permission.DeleteLock, mms-object:Permission.CreateDiff, mms-object:Permission.DeleteDiff .
243+
mms:implies mms-object:Permission.UpdateRepo, mms-object:Permission.CreateRef, mms-object:Permission.DeleteRef, mms-object:Permission.CreateArtifact, mms-object:Permission.DeleteArtifact, mms-object:Permission.CreateDiff, mms-object:Permission.DeleteDiff .
244+
245+
mms-object:Permission.CreateRef a mms:Permission .
246+
247+
mms-object:Permission.ReadRef a mms:Permission .
248+
249+
mms-object:Permission.UpdateRef a mms:Permission ;
250+
mms:implies mms-object:Permission.ReadRef, mms-object:Permission.UpdateBranch, mms-object:Permission.UpdateLock .
251+
252+
mms-object:Permission.DeleteRef a mms:Permission ;
253+
mms:implies mms-object:Permission.CreateBranch, mms-object:Permission.DeleteBranch, mms-object:Permission.CreateLock, mms-object:Permission.DeleteLock .
236254

237255
mms-object:Permission.CreateBranch a mms:Permission .
238256

@@ -248,9 +266,32 @@ graph m-graph:AccessControl.Definitions {
248266

249267
mms-object:Permission.ReadLock a mms:Permission .
250268

251-
mms-object:Permission.DeleteLock a mms:Permission ;
269+
mms-object:Permission.UpdateLock a mms:Permission ;
252270
mms:implies mms-object:Permission.ReadLock .
253271

272+
mms-object:Permission.DeleteLock a mms:Permission ;
273+
mms:implies mms-object:Permission.UpdateLock .
274+
275+
mms-object:Permission.CreateArtifact a mms:Permission .
276+
277+
mms-object:Permission.ReadArtifact a mms:Permission .
278+
279+
mms-object:Permission.UpdateArtifact a mms:Permission ;
280+
mms:implies mms-object:Permission.ReadArtifact .
281+
282+
mms-object:Permission.DeleteArtifact a mms:Permission ;
283+
mms:implies mms-object:Permission.UpdateArtifact .
284+
285+
mms-object:Permission.CreateCommit a mms:Permission .
286+
287+
mms-object:Permission.ReadCommit a mms:Permission .
288+
289+
mms-object:Permission.UpdateCommit a mms:Permission ;
290+
mms:implies mms-object:Permission.ReadCommit .
291+
292+
mms-object:Permission.DeleteCommit a mms:Permission ;
293+
mms:implies mms-object:Permission.UpdateCommit .
294+
254295
mms-object:Permission.CreateAccessControlAny a mms:Permission .
255296

256297
mms-object:Permission.ReadAccessControlAny a mms:Permission .

0 commit comments

Comments
 (0)