Sfoglia il codice sorgente

Update Dockerfile and local version number for gluon v2015.1.2

Markus Lindenberg 9 anni fa
parent
commit
8dcb64f55d
3 ha cambiato i file con 4 aggiunte e 2 eliminazioni
  1. 2 1
      Dockerfile
  2. 1 0
      docker/build.sh
  3. 1 1
      site.mk

+ 2 - 1
Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:jessie
 MAINTAINER Markus Lindenberg <markus@lindenberg.io>
 
-ENV GLUON_TAG v2015.1.1
+ENV GLUON_TAG v2015.1.2
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBIAN_PRIORITY critical
@@ -14,6 +14,7 @@ RUN apt-get -y install --no-install-recommends ca-certificates python wget file
 ADD docker/build.sh /usr/src/build.sh
 ADD site.mk /usr/src/site.mk
 ADD site.conf /usr/src/site.conf
+ADD i18n /usr/src/i18n
 
 RUN adduser --system --home /usr/src/build build
 USER build

+ 1 - 0
docker/build.sh

@@ -10,6 +10,7 @@ git clone https://github.com/freifunk-gluon/gluon.git gluon -b "${GLUON_TAG}"
 mkdir -p gluon/site
 cp /usr/src/site.mk gluon/site/
 cp /usr/src/site.conf gluon/site/
+cp -r /usr/src/i18n gluon/site/
 
 # Build
 cd gluon

+ 1 - 1
site.mk

@@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \
         haveged
 
 
-DEFAULT_GLUON_RELEASE := 0.7.1
+DEFAULT_GLUON_RELEASE := 0.7.2
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)