Skip to content

Commit

Permalink
Fileadmin react App part of Distribution in admin bundle
Browse files Browse the repository at this point in the history
  • Loading branch information
escv committed May 21, 2018
1 parent cb3d433 commit 9996dee
Show file tree
Hide file tree
Showing 52 changed files with 32,907 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ bin/
.classpath
.project
.settings
.*.swp
build/

felix-cache/
Expand All @@ -17,5 +18,6 @@ Thumbs.db

cnf/release/*.zip
cnf/run/bundle/net.younic.*
!cnf/run/bin/

bin_test/
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ MAINTAINER Andre Albert <andre.albert82@googlemail.com>

WORKDIR /home/younic

# EXPOSE 8080/tcp

RUN apk --update add git openssh && \
rm -rf /var/lib/apt/lists/* && \
rm /var/cache/apk/*
Expand All @@ -17,4 +19,4 @@ RUN unzip younic.zip && \

RUN git clone https://github.com/escv/younic-sample.git /home/younic/cms-root

# ENTRYPOINT ["./start.sh"]
ENTRYPOINT ["./start.sh"]
3 changes: 2 additions & 1 deletion cnf/launch.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
-runproperties: \
log4j.configuration=file:///Users/aalbert/Development/cynic/cnf/run/conf/log4j.properties,\
org.osgi.service.http.port=8282,\
net.younic.cms.root=../root,\
net.younic.cms.root=../../younic-sample,\
net.younic.admin.fileadmin-root=/Users/aalbert/Development/cynic/cnf/run/fileadmin,\
net.younic.devmode=false


Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions cnf/run/conf/config.properties
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,6 @@ felix.log.level=1
#

net.younic.cms.root=/home/younic/cms-root
net.younic.admin.fileadmin-root=/home/younic/fileadmin
org.osgi.service.http.port=8080
obr.repository.url=http://felix.apache.org/obr/releases.xml
6 changes: 6 additions & 0 deletions cnf/run/fileadmin/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"main.css": "static/css/main.f4e80414.css",
"main.css.map": "static/css/main.f4e80414.css.map",
"main.js": "static/js/main.a6829a5c.js",
"main.js.map": "static/js/main.a6829a5c.js.map"
}
Loading

0 comments on commit 9996dee

Please sign in to comment.