Switch to Open Container Specification labels as label-schema.org one…

…s are deprecated
crazy-max · Feb 23, 2020 · 3ae2dd3 · 3ae2dd3
1 parent e109186
commit 3ae2dd3
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.14.2 (2020/02/23)
+
+* Switch to Open Container Specification labels as label-schema.org ones are deprecated
+
 ## 1.14.1 (2019/10/22)
 
 * Allow to set a custom hostport for Docker (Issue #61)

diff --git a/Dockerfile b/Dockerfile
@@ -5,15 +5,15 @@ ARG VCS_REF
 ARG VERSION
 
 LABEL maintainer="CrazyMax" \
-  org.label-schema.build-date=$BUILD_DATE \
-  org.label-schema.name="csgo-server-launcher" \
-  org.label-schema.description="CSGO Server Launcher" \
-  org.label-schema.version=$VERSION \
-  org.label-schema.url="https://github.com/crazy-max/csgo-server-launcher" \
-  org.label-schema.vcs-ref=$VCS_REF \
-  org.label-schema.vcs-url="https://github.com/crazy-max/csgo-server-launcher" \
-  org.label-schema.vendor="CrazyMax" \
-  org.label-schema.schema-version="1.0"
+  org.opencontainers.image.created=$BUILD_DATE \
+  org.opencontainers.image.url="https://github.com/crazy-max/csgo-server-launcher" \
+  org.opencontainers.image.source="https://github.com/crazy-max/csgo-server-launcher" \
+  org.opencontainers.image.version=$VERSION \
+  org.opencontainers.image.revision=$VCS_REF \
+  org.opencontainers.image.vendor="CrazyMax" \
+  org.opencontainers.image.title="CSGO Server Launcher" \
+  org.opencontainers.image.description="Create and launch your Counter-Strike Global Offensive Dedicated Server" \
+  org.opencontainers.image.licenses="MIT"
 
 RUN dpkg --add-architecture i386 \
   && apt-get update \

diff --git a/csgo-server-launcher.sh b/csgo-server-launcher.sh
@@ -10,12 +10,12 @@
 
 ##################################################################################
 #                                                                                #
-#  CSGO Server Launcher v1.14.1                                                  #
+#  CSGO Server Launcher v1.14.2                                                  #
 #                                                                                #
 #  A simple script to launch your Counter-Strike : Global Offensive              #
 #  Dedicated Server.                                                             #
 #                                                                                #
-#  Copyright (C) 2013-2019 CrazyMax                                              #
+#  Copyright (C) 2013-2020 CrazyMax                                              #
 #                                                                                #
 #  Counter-Strike : Global Offensive Server Launcher is free software; you can   #
 #  redistribute it and/or modify it under the terms of the GNU Lesser General    #

diff --git a/doc/installation.md b/doc/installation.md
@@ -14,7 +14,7 @@ For usage and info, check the README in the [docker](https://github.com/crazy-ma
 A script is available to perform an installation with a single command:
 
 ```
-$ sudo curl -sSLk https://github.com/crazy-max/csgo-server-launcher/releases/download/v1.14.1/install.sh | sudo bash
+$ sudo curl -sSLk https://github.com/crazy-max/csgo-server-launcher/releases/download/v1.14.2/install.sh | sudo bash
 ```
 
 This should output something like this:
@@ -51,11 +51,11 @@ Or you can install it manually as root or sudoer:
 $ dpkg --add-architecture i386
 $ apt-get update
 $ apt-get install -y -q libc6-i386 lib32stdc++6 lib32gcc1 lib32ncurses5 lib32z1 curl gdb screen tar wget
-$ curl -sSLk https://github.com/crazy-max/csgo-server-launcher/releases/download/v1.14.1/csgo-server-launcher.sh -o /etc/init.d/csgo-server-launcher
+$ curl -sSLk https://github.com/crazy-max/csgo-server-launcher/releases/download/v1.14.2/csgo-server-launcher.sh -o /etc/init.d/csgo-server-launcher
 $ chmod +x /etc/init.d/csgo-server-launcher
 $ update-rc.d csgo-server-launcher defaults
 $ mkdir -p /etc/csgo-server-launcher/
-$ curl -sSLk https://github.com/crazy-max/csgo-server-launcher/releases/download/v1.14.1/csgo-server-launcher.conf -o /etc/csgo-server-launcher/csgo-server-launcher.conf
+$ curl -sSLk https://github.com/crazy-max/csgo-server-launcher/releases/download/v1.14.2/csgo-server-launcher.conf -o /etc/csgo-server-launcher/csgo-server-launcher.conf
 ```
 
 > :warning: Replace lib32ncurses5 with lib32ncurses6 on Debian buster based distros

diff --git a/install.sh b/install.sh
@@ -4,7 +4,7 @@
 #                                                                                #
 #  Installs CSGO Server Launcher                                                 #
 #                                                                                #
-#  Copyright (C) 2013-2019 CrazyMax                                              #
+#  Copyright (C) 2013-2020 CrazyMax                                              #
 #                                                                                #
 #  Counter-Strike : Global Offensive Server Launcher is free software; you can   #
 #  redistribute it and/or modify it under the terms of the GNU Lesser General    #
@@ -37,7 +37,7 @@ fi
 
 ### Vars
 distribVersion=$(sed 's/\..*//' /etc/debian_version)
-version=1.14.1
+version=1.14.2
 downloadUrl="https://github.com/crazy-max/csgo-server-launcher/releases/download/v$version"
 scriptName="csgo-server-launcher"
 scriptPath="/etc/init.d/$scriptName"