update to new format

417ae010 · Eric Vidal · 633e4b64 · 417ae010 · 417ae010 · 633e4b64
Commit 417ae010 authored 1 year ago by Eric Vidal
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 stages:
    - build
-    - commit
    - deploy
+    - request
+
+before_script:
+  - cp ./pacman.conf /etc/pacman.conf.builder

 package:
  stage: build
  script:
-    - mkdir -p /etc/pkg
-    - cp ./pkg.cfg /etc/pkg/pkg.cfg
-    - cp ./pacman.conf.builder /etc/pacman.conf.builder
    - pkg-prepare.sh
-    - pkg-build.sh --chdir=trunk $CI_PROJECT_DIR
-
+    - pkg-build.sh
  artifacts:
-    name: $CI_PROJECT_NAME-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
+    name: $CI_PROJECT_NAME-$CI_COMMIT_SHORT_SHA
    paths:
     - "*.pkg.tar.xz"
-
-  only:
-    changes:
-      - trunk/PKGBUILD
-
-commit:
-  stage: commit
  only:
-    changes:
-      - trunk/PKGBUILD
-
-  script:
-    - pkg-commit.sh
+  - tags

 deploy:
  stage: deploy
@@ -36,7 +24,12 @@ deploy:
    - package
  script:
    - pkg-deploy.sh
+  only:
+  - tags

+request:
+  stage: build
+  script:
+    - pkg-build.sh
  only:
-    changes:
-      - trunk/PKGBUILD
+  - merge_requests
--- a/pacman.conf
+++ b/pacman.conf
+[options]
+HoldPkg = pacman glibc
+Architecture = x86_64
+IgnorePkg = systemd systemd-libs
+CheckSpace
+ParallelDownloads = 5
+SigLevel = Required
+LocalFileSigLevel = Optional
+
+[obcore]
+Server = https://cloud.server.obarun.org/$repo/os/$arch/
+
+[obextra]
+Server = https://cloud.server.obarun.org/$repo/os/$arch/
+
+[observice]
+Server = https://cloud.server.obarun.org/$repo/os/$arch/
+
+[core]
+SigLevel = DatabaseOptional
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+SigLevel = DatabaseOptional
+Include = /etc/pacman.d/mirrorlist
--- a/pacman.conf.builder
+++ b/pacman.conf.builder
-#
-# pacman.conf used if the options --pacman-conf passed at our-build.sh on the .gitlab.yml file
-#
-
-[options]
-HoldPkg     = pacman glibc
-Architecture = auto
-IgnorePkg   = systemd
-IgnorePkg   = systemd-libs
-NoExtract   = usr/lib/libsystemd*.*
-Color
-CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-#XferCommand =
-
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-
-#[obcore-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obcore]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[obextra-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obextra]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[obcommunity-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obcommunity]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[obmultilib-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[obmultilib]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[observice-testing]
-#SigLevel = Required
-#Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-[observice]
-SigLevel = Required
-Server = https://cloud.server.obarun.org/$repo/os/$arch/
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist
--- a/pkg.cfg
+++ b/pkg.cfg
-# Options passed to makepkg
-makepkg_opts=( "--noconfirm" "--nosign" "--syncdeps" "--rmdeps" "--clean" "--cleanbuild" )
--- a/version/0.0.1-2/LICENSE
+++ b/version/0.0.1-2/LICENSE
-Copyright (c) 2018-2019 Eric Vidal <eric@obarun.org>
-Copyright (c) 2015-2019 Jean-Michel T.Dydak <jean-michel@obarun.org>
-All rights reserved.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/version/0.0.1-2/PKGBUILD
+++ b/version/0.0.1-2/PKGBUILD
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource        : url="https://framagit.org/pkg/observice/dockerd-66serv"
-#--------------------------------------------------------------------------------------
-
-pkgdesc="${pkgbase} service for 66 tools"
-
-pkgver=0.0.1
-pkgrel=2
-
-service=dockerd
-pkgbase=dockerd
-pkgname="${pkgbase}"-66serv
-
-url="https://framagit.org/pkg/observice/${pkgbase}-66serv.git"
-
-track=branch
-target=master
-source=("${pkgname}::git+${url}#${track}=${target}")
-
-#------------------------------BUILD CONFIGURATION----------------------
-
-makedepends=(
-    'git'
-)
-
-#------------------------------PACKAGE----------------------------------
-
-package() {
-    cd "${pkgname}/trunk"
-
-    install -Dm 0644 ${service} "${pkgdir}"/usr/lib/66/service/${service}
-    install -Dm 0644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
-}
-
-#------------------------------INSTALL CONFIGURATION--------------------
-
-arch=('x86_64')
-pkgdepends=docker
-
-depends=(
-    "${pkgdepends}"
-    '66'
-)
-
-#-------------------------------SECURITY AND LICENCE--------------------   
-
-sha512sums=('SKIP')
-license=('ISC')
--- a/version/0.0.1-2/docker
+++ b/version/0.0.1-2/docker
-[main]
-@type = classic
-@name = docker
-@description = "docker service"
-@options = ( log )
-@user = (root)
-@maxdeath = 3
-
-[start]
-@build = auto
-
-@execute = 
-(
-s6-ipcserver-socketbinder -a 0660 -- /run/docker.sock
-if { chown root:docker /run/docker.sock }
-dockerd -H unix:///run/docker.sock
-
-)
- 
-[logger]
-@build = auto 
-@timestamp = iso
--- a/version/0.0.1-2/dockerd
+++ b/version/0.0.1-2/dockerd
-[main]
-@type = classic
-@name = dockerd
-@description = "dockerd service"
-@options = ( log )
-@user = (root)
-@maxdeath = 3
-
-[start]
-@build = auto
-
-@execute = 
-(
-s6-ipcserver-socketbinder -a 0660 -- /run/docker.sock
-if { chown root:docker /run/docker.sock }
-dockerd -H unix:///run/docker.sock
-
-)
- 
-[logger]
-@build = auto 
-@timestamp = iso
--- a/version/0.0.1-3/LICENSE
+++ b/version/0.0.1-3/LICENSE
-Copyright (c) 2018-2019 Eric Vidal <eric@obarun.org>
-Copyright (c) 2015-2019 Jean-Michel T.Dydak <jean-michel@obarun.org>
-All rights reserved.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/version/0.0.1-3/PKGBUILD
+++ b/version/0.0.1-3/PKGBUILD
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# Source        : url="https://framagit.org/pkg/service/dockerd-66serv"
-#--------------------------------------------------------------------------------------
-
-pkgbase=dockerd
-pkgdepends=docker
-pkgname="${pkgbase}"-66serv
-pkgver=0.0.1
-pkgrel=3
-
-pkgdesc="${pkgbase} service for 66 tools"
-url="https://framagit.org/pkg/service/${pkgbase}-66serv.git"
-
-track=branch
-target=master
-source=("${pkgname}::git+${url}#${track}=${target}")
-
-depends=(
-    "${pkgdepends}"
-    '66')
-
-makedepends=(
-    'git')
-
-#--------------------------------------------------------------------------------------
-
-package() {
-    cd "${pkgname}/trunk"
-
-    install -Dm 0644 dockerd "${pkgdir}"/usr/lib/66/service/dockerd
-    install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
-}
-
-#--------------------------------------------------------------------------------------
-
-sha512sums=('SKIP')
-license=('ISC')
-arch=('x86_64')
--- a/version/0.0.1-3/dockerd
+++ b/version/0.0.1-3/dockerd
-[main]
-@type = classic
-@name = dockerd
-@description = "dockerd service"
-@options = ( log )
-@user = (root)
-@maxdeath = 3
-
-[start]
-@build = auto
-
-@execute = 
-(
-s6-ipcserver-socketbinder -a 0660 -- /run/docker.sock
-if { chown root:docker /run/docker.sock }
-dockerd -H unix:///run/docker.sock
-
-)
- 
-[logger]
-@build = auto 
-@timestamp = iso
--- a/version/0.1.0-1/LICENSE
+++ b/version/0.1.0-1/LICENSE
-Copyright (c) 2018-2019 Eric Vidal <eric@obarun.org>
-Copyright (c) 2015-2019 Jean-Michel T.Dydak <jean-michel@obarun.org>
-All rights reserved.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/version/0.1.0-1/PKGBUILD
+++ b/version/0.1.0-1/PKGBUILD
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://framagit.org/pkg/observice/dockerd-66serv"
-#--------------------------------------------------------------------------------------
-
-pkgdesc="${pkgbase} service for 66 tools"
-
-pkgver=0.1.0
-pkgrel=1
-
-service=dockerd
-pkgbase=dockerd
-pkgname="${pkgbase}"-66serv
-
-url="https://framagit.org/pkg/observice/${pkgbase}-66serv.git"
-
-track=branch
-target=master
-source=("${pkgname}::git+${url}#${track}=${target}")
-
-#------------------------------BUILD CONFIGURATION----------------------
-
-makedepends=(
-    'git'
-)
-
-#------------------------------PACKAGE----------------------------------
-
-package() {
-    cd "${pkgname}/trunk"
-
-    install -Dm 0644 ${service} "${pkgdir}"/usr/lib/66/service/${service}
-    install -Dm 0644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
-}
-
-#------------------------------INSTALL CONFIGURATION--------------------
-
-arch=('x86_64')
-pkgdepends=docker
-
-depends=(
-    "${pkgdepends}"
-    '66'
-)
-
-#-------------------------------SECURITY AND LICENCE--------------------   
-
-sha512sums=('SKIP')
-license=('ISC')
--- a/version/0.1.0-1/dockerd
+++ b/version/0.1.0-1/dockerd
-[main]
-@type = classic
-@description = "dockerd service"
-@options = ( log )
-@user = (root)
-@maxdeath = 3
-
-[start]
-@build = auto
-
-@execute = 
-(
-s6-ipcserver-socketbinder -a 0660 -- /run/docker.sock
-if { chown root:docker /run/docker.sock }
-dockerd -H unix:///run/docker.sock
-
-)
- 
-[logger]
-@build = auto 
-@timestamp = iso
--- a/version/0.2.0-1/LICENSE
+++ b/version/0.2.0-1/LICENSE
-Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
-Copyright (c) 2018-2021 Jean-Michel T.Dydak <jean-michel@obarun.org>
-All rights reserved.
-
-Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- a/version/0.2.0-1/PKGBUILD
+++ b/version/0.2.0-1/PKGBUILD
-# Obarun        : 66 init/supervisor
-# Maintainer    : Eric Vidal <eric@obarun.org>
-# Maintainer    : Jean-Michel T.Dydak <jean-michel@obarun.org>
-# PkgSource     : url="https://git.obarun.org/pkg/observice/dockerd-66serv"
-#--------------------------------------------------------------------------------------
-
-service=dockerd
-pkgbase=dockerd
-
-pkgname="${pkgbase}"-66serv
-
-pkgdesc="${pkgbase} service for 66 tools"
-
-pkgver=0.2.0
-pkgrel=1
-
-url="https://git.obarun.org/pkg/observice/${pkgbase}-66serv.git"
-
-track=branch
-target=master
-source=("${pkgname}::git+${url}#${track}=${target}")
-
-#------------------------------BUILD CONFIGURATION----------------------
-
-makedepends=(
-    'git'
-)
-
-#--------------------------------------------------------------------------------------
-
-prepare() {
-	cd "${pkgname}/trunk"
-	sed "s:@VERSION@:${pkgver}:" -i "${service}"
-}
-
-#------------------------------PACKAGE----------------------------------
-
-package() {
-    cd "${pkgname}/trunk"
-
-    install -Dm 0644 ${service} "${pkgdir}"/usr/lib/66/service/${service}
-    install -Dm 0644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
-}
-
-#------------------------------INSTALL CONFIGURATION--------------------
-
-arch=('x86_64')
-
-depends=(
-    '66>=0.3.0.0'
-    '66-tools>=0.0.5.0'
-    "docker"
-)
-
-#-------------------------------SECURITY AND LICENCE--------------------   
-
-sha512sums=('SKIP')
-license=('0BSD')
--- a/version/0.2.0-1/dockerd
+++ b/version/0.2.0-1/dockerd
-[main]
-@type = classic
-@version = @VERSION@
-@description = "dockerd service"
-@options = ( log env )
-@user = ( root )
-@maxdeath = 3
-
-[start]
-@build = auto
-@execute = (
-	execl-toc -S ${socket} -m 0660
-	if { chown root:docker ${socket} }
-	dockerd -H unix://${socket}
-)
-
-[environment]
-socket=!/run/docker.sock