switch docker image from centos to fedora

Author: cyrilst

.cirrus.yml

@@ -2,7 +2,6 @@ task:
   env:
     GOPROXY: https://proxy.golang.org
     matrix:
-      VERSION: 1.19
       VERSION: 1.20
       VERSION: 1.21
 

README.asciidoc

@@ -31,7 +31,8 @@ be replayed with the +sshproxy-replay+ command.
 Compilation
 -----------
 
-Install the Go compiler suite: see http://golang.org/doc/install for details.
+Install the Go (version >= 1.20) compiler suite: see
+http://golang.org/doc/install for details.
 
 Define and export the +$GOPATH+ directory where the source code will be
 unpacked (e.g. '$HOME/go'):
@@ -69,7 +70,7 @@ Modify the SSH daemon configuration +/etc/ssh/sshd_config+ by adding:
 Copying
 -------
 
-Copyright (C) 2015-2022 CEA/DAM/DIF
+Copyright (C) 2015-2023 CEA/DAM/DIF
 
 sshproxy is distributed under the CeCILL-B, a French transposition of the BSD
 license. See the included files +Licence_CeCILL-B_V1-en.txt+ (English version)

doc/sshproxy-dumpd.txt

@@ -49,7 +49,7 @@ Cyril Servant <[email protected]>.
 
 COPYING
 -------
-Copyright (C) 2015-2022 CEA/DAM/DIF. Free use of this software is granted
+Copyright (C) 2015-2023 CEA/DAM/DIF. Free use of this software is granted
 under the term of the CeCILL-B license.
 
 // vim:tw=78:ft=asciidoc:

doc/sshproxy-replay.txt

@@ -59,7 +59,7 @@ Cyril Servant <[email protected]>.
 
 COPYING
 -------
-Copyright (C) 2015-2022 CEA/DAM/DIF. Free use of this software is granted
+Copyright (C) 2015-2023 CEA/DAM/DIF. Free use of this software is granted
 under the term of the CeCILL-B license.
 
 // vim:tw=78:ft=asciidoc:

doc/sshproxy.txt

@@ -52,7 +52,7 @@ Servant <[email protected]>.
 
 COPYING
 -------
-Copyright (C) 2015-2022 CEA/DAM/DIF. Free use of this software is granted
+Copyright (C) 2015-2023 CEA/DAM/DIF. Free use of this software is granted
 under the term of the CeCILL-B license.
 
 // vim:tw=78:ft=asciidoc:

doc/sshproxy.yaml.txt

@@ -345,7 +345,7 @@ Servant <[email protected]>.
 
 COPYING
 -------
-Copyright (C) 2015-2022 CEA/DAM/DIF. Free use of this software is granted
+Copyright (C) 2015-2023 CEA/DAM/DIF. Free use of this software is granted
 under the term of the CeCILL-B license.
 
 // vim:tw=78:ft=asciidoc:

doc/sshproxyctl.txt

@@ -88,7 +88,7 @@ Servant <[email protected]>.
 
 COPYING
 -------
-Copyright (C) 2015-2022 CEA/DAM/DIF. Free use of this software is granted
+Copyright (C) 2015-2023 CEA/DAM/DIF. Free use of this software is granted
 under the term of the CeCILL-B license.
 
 // vim:tw=78:ft=asciidoc:

misc/sshproxy.spec

@@ -9,7 +9,7 @@ Summary:        SSH proxy
 License:        CeCILL-B
 Source:         https://github.com/cea-hpc/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 ExclusiveArch:  %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm} aarch64}
-BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+BuildRequires:  golang
 BuildRequires:  asciidoc
 
 Summary:        SSH proxy

test/README.asciidoc

@@ -44,22 +44,14 @@ diff --git a/test/docker-compose.yaml b/test/docker-compose.yaml
 index 65ae927..0621932 100644
 --- a/test/docker-compose.yaml
 +++ b/test/docker-compose.yaml
-@@ -5,14 +5,14 @@ services:
-         container_name: tester
-         hostname: tester
-         build: centos-image
--        user: centos
--        working_dir: /home/centos
-+        volumes:
-+            - ../test:/sshproxy-test
-         depends_on:
-             - gateway1
-             - gateway2
+@@ -13,8 +13,8 @@ services:
              - server1
              - server2
              - server3
+-        #command: ["/usr/bin/sleep", "1000"]
 -        command: ["/usr/bin/go", "test", "-v", "-failfast", "-tags", "docker", "./sshproxy_test.go"]
-+        command: ["/usr/sbin/sshd", "-De"]
++        command: ["/usr/bin/sleep", "1000"]
++        #command: ["/usr/bin/go", "test", "-v", "-failfast", "-tags", "docker", "./sshproxy_test.go"]
  
      gateway1:
          container_name: gateway1
@@ -72,13 +64,7 @@ Then we start (and build if necessary) all containers:
 Once every container is started, we can connect to the tester container:
 
 	$ docker-compose exec tester /bin/bash
-	[root@tester /]#
-
-It is then recommended to change the test file by a link to the one found in
-the repository (thanks to the volume mounted in the container):
-
-	[root@tester /]# su - centos
-	[centos@tester ~]$ ln -s -f /sshproxy-test/centos-image/sshproxy_test.go
+	[centos@tester ~]$
 
 We then use the +go test+ command to run the tests:
 

test/centos-image/Dockerfile

@@ -1,10 +1,9 @@
-FROM centos:7
+FROM fedora:latest
 
 # Install development environment to compile RPM
 RUN set -ex \
-	&& yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
 	&& yum -y update \
-	&& yum -y install asciidoc etcd git golang iproute make openssh-server rpm-build
+	&& yum -y install asciidoc etcd git golang hostname iproute make openssh-server rpm-build
 
 # Create centos, user1 and user2 users ; centos and user1 groups
 RUN set -ex \