Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HOTFIX. Freeze Openvpn dependency #162

Merged
merged 1 commit into from Feb 19, 2018
Merged

HOTFIX. Freeze Openvpn dependency #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions bin/client_docker/ubuntu/Dockerfile
View file
Open in desktop
Expand Up @@ -31,10 +31,9 @@ RUN apt-get update \
&& curl -s https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add \
&& echo "deb http://build.openvpn.net/debian/openvpn/stable xenial main" > /etc/apt/sources.list.d/openvpn-aptrepo.list \
&& apt-get update \
&& apt-get install -y openvpn ca-certificates iptables \
&& dpkg --install --force-depends /tmp/mysterium-client.deb \
&& apt-get install -y --fix-broken \
&& rm -rf /var/cache/apt/* /var/lib/apt/lists/* /tmp/mysterium-client.deb

COPY bin/client_docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
4 changes: 2 additions & 2 deletions bin/client_package_debian
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@ printf "Building Debian package '$PACKAGE_FILE' for architecture '$ARCH' ..\n" \
--version "$VERSION" \
--architecture="$ARCH" \
--package="$PACKAGE_FILE" \
--depends "openvpn (>= 2.3.3)" \
--depends "openvpn (>= 2.4.0)" \
--depends "ca-certificates" \
--after-install bin/client_package/installation/post-install.sh \
--after-remove bin/client_package/installation/post-uninstall.sh \
Expand All @@ -70,4 +70,4 @@ fi
debber deb:contents ${PACKAGE_FILE}

printf "\e[0;32m%s\e[0m\n" "Debian packaging process for architecture '$ARCH' complete!"
exit 0
exit 0
1 change: 0 additions & 1 deletion bin/server_docker/ubuntu/Dockerfile
View file
Open in desktop
Expand Up @@ -31,7 +31,6 @@ RUN apt-get update \
&& curl -s https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add \
&& echo "deb http://build.openvpn.net/debian/openvpn/stable xenial main" > /etc/apt/sources.list.d/openvpn-aptrepo.list \
&& apt-get update \
&& apt-get install -y openvpn ca-certificates iptables \
&& dpkg --install --force-depends /tmp/mysterium-node.deb \
&& apt-get install -y --fix-broken \
&& rm -rf /var/cache/apt/* /var/lib/apt/lists/* /tmp/mysterium-node.deb
Expand Down
4 changes: 2 additions & 2 deletions bin/server_package_debian
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ printf "Building Debian package '$PACKAGE_FILE' for architecture '$ARCH' ..\n" \
--version "$VERSION" \
--architecture="$ARCH" \
--package="$PACKAGE_FILE" \
--depends "openvpn (>= 2.3.3)" \
--depends "openvpn (>= 2.4.0)" \
--depends "ca-certificates" \
--depends "iptables" \
--after-install bin/server_package/installation/post-install.sh \
Expand All @@ -69,4 +69,4 @@ fi
debber deb:contents ${PACKAGE_FILE}

printf "\e[0;32m%s\e[0m\n" "Debian packaging process for architecture '$ARCH' complete!"
exit 0
exit 0
8 changes: 4 additions & 4 deletions bin/server_package_docker
View file
Open in desktop
@@ -1,10 +1,10 @@
#!/bin/bash

###########################################################################
# Creates Docker image and uploads it DockerHub https://hub.docker.com/r/mysteriumnetwork/mysterium-node/
# Creates Docker image and uploads it to DockerHub https://hub.docker.com/r/mysteriumnetwork/mysterium-node/
#
# To create a release, simple execute:
#> bin/server_package_docker <version> [<docker_tag>]
# To create a release, simply execute:
#> bin/server_package_docker version [docker_tag]

# Usage example:
#> bin/server_package_docker 0.0.1
Expand Down Expand Up @@ -35,4 +35,4 @@ if [ $? -ne 0 ] ; then
fi

printf "\e[0;32m%s\e[0m\n" "Docker image building process complete!"
exit 0
exit 0