experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

base hello docker example

Browse source
This commit is contained in:
Olof Hagsand 2019-08-17 14:55:44 +00:00
parent ee329ee382
commit 388da01d0b
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
docker/base/Dockerfile
View file

@ -67,11 +67,11 @@ RUN make
RUN make install RUN make install
RUN make install-include RUN make install-include
# Build and install the clixon example (not really necessary for base) # Build and install the clixon hello example (not really necessary for base)
WORKDIR /clixon/clixon/example WORKDIR /clixon/clixon/example/hello
RUN make RUN make
RUN make install RUN make install
RUN install example.xml /clixon/build/etc/clixon.xml RUN install hello.xml /clixon/build/etc/clixon.xml # For 2nd level
# #
# Stage 2 # Stage 2
@ -87,9 +87,6 @@ RUN adduser -D -H www-data
# nginx adds group www-data # nginx adds group www-data
RUN apk add --update nginx RUN apk add --update nginx
# Test-specific (for test scripts)
#RUN apk add --update sudo curl bash
# Expose nginx port for restconf # Expose nginx port for restconf
EXPOSE 80 EXPOSE 80

2
example/hello/Makefile.in
View file

@ -118,8 +118,8 @@ clean:
distclean: clean distclean: clean
rm -f Makefile *~ .depend rm -f Makefile *~ .depend
install: $(YANGSPECS) $(CLISPECS) $(PLUGINS) $(APPNAME).xml install: $(YANGSPECS) $(CLISPECS) $(PLUGINS) $(APPNAME).xml
install -d -m 0755 $(dir $(DESTDIR)$(CLIXON_DEFAULT_CONFIG))
install -m 0644 $(APPNAME).xml $(DESTDIR)$(CLIXON_DEFAULT_CONFIG) install -m 0644 $(APPNAME).xml $(DESTDIR)$(CLIXON_DEFAULT_CONFIG)
install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME) install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)
install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/clispec install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/clispec