Skip to content

Commit 4a0fd38

Browse files
committed
NEW VERSION
1 parent 9463e73 commit 4a0fd38

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

build.gradle

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,20 @@ ext {
1111
BOOKMARKS_BASE = "/var/lib/mageddo/bookmarks-node"
1212
BOOKMARKS_INTERNAL_BASE = "/opt/bookmarks"
1313
}
14-
def lastVersion = project.version
15-
updateVersion << {
16-
println "> upgrading docker-compose version from: ${lastVersion} to ${project.version}"
14+
15+
checkCommitNeeded.doFirst {
16+
17+
println "> upgrading docker-compose version=${project.version}"
18+
1719
updateVersion("${project.projectDir}/docker-compose.yml", "(dns-proxy-server.*)(\\d+\\.\\d\\.+\\d+)", "\$1${project.version}")
1820
updateVersion("${project.projectDir}/hub.Dockerfile", '(\\d+\\.\\d\\.+\\d+)', "${project.version}")
21+
22+
def sout = new StringBuilder()
23+
def proc = ['git', 'commit', '-a', '-m NEW VERSION'].execute()
24+
proc.consumeProcessOutput(sout, sout)
25+
proc.waitForOrKill(3000)
26+
println "> $sout"
27+
1928
}
2029
release {
2130
project.ext.set("release.useAutomaticVersion", true)

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
network_mode: bridge
1717
prod-docker-dns-prod-server: # run from a docker image
1818
container_name: dns-proxy-server
19-
image: defreitas/dns-proxy-server:2.0.17
19+
image: defreitas/dns-proxy-server:2.0.18
2020
hostname: dns.mageddo
2121
volumes:
2222
- /opt/dns-proxy-server/conf:/app/conf
@@ -30,8 +30,8 @@ services:
3030
context: .
3131
dockerfile: Dockerfile
3232
container_name: docker-dns-server-docker-compiler
33-
image: defreitas/dns-proxy-server:2.0.17
33+
image: defreitas/dns-proxy-server:2.0.18
3434
prod-build-dns-proxy-server: # build the binary
3535
extends: gocompiler-docker-dns-proxy
3636
container_name: docker-dns-server-compiler
37-
command: bash -c "rm -rf build/ && mkdir -p build/ && git submodule init && git submodule update && cd src && go test -cover=false ./github.com/mageddo/dns-proxy-server/.../ && go build -v -o ../build/dns-proxy-server && cp -r ../static ../build/ && cp ../docker-compose.yml ../build/docker-compose.yml && cp ../dns-proxy-service ../build/dns-proxy-service && cd ../build/ && tar -cvf dns-proxy-server-2.0.17.tgz *"
37+
command: bash -c "rm -rf build/ && mkdir -p build/ && git submodule init && git submodule update && cd src && go test -cover=false ./github.com/mageddo/dns-proxy-server/.../ && go build -v -o ../build/dns-proxy-server && cp -r ../static ../build/ && cp ../docker-compose.yml ../build/docker-compose.yml && cp ../dns-proxy-service ../build/dns-proxy-service && cd ../build/ && tar -cvf dns-proxy-server-2.0.18.tgz *"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=2.0.17
1+
version=2.0.18

hub.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM debian:8
22
WORKDIR /app
33
ENV TMP_NAME=/tmp/dns-proxy-server.tgz
44
RUN apt-get update && apt-get install -y curl
5-
RUN curl -L https://github.com/mageddo/dns-proxy-server/releases/download/2.0.17/dns-proxy-server-2.0.17.tgz > $TMP_NAME && \
5+
RUN curl -L https://github.com/mageddo/dns-proxy-server/releases/download/2.0.18/dns-proxy-server-2.0.18.tgz > $TMP_NAME && \
66
tar -xvf $TMP_NAME -C /app/ && rm -f $TMP_NAME
77

88
VOLUME ["/var/run/docker.sock", "/var/run/docker.sock"]

0 commit comments

Comments
 (0)