Rename centos to fedora

Author: cyrilst

.cirrus.yml

@@ -4,6 +4,7 @@ task:
  matrix:
  VERSION: 1.20
  VERSION: 1.21
+ VERSION: 1.22
 
  container:
  image: golang:$VERSION

Makefile

@@ -21,7 +21,7 @@ RECORD_SRC	= $(wildcard pkg/record/*.go)
 UTILS_SRC= $(wildcard pkg/utils/*.go)
 
 PKGS= $(shell $(GO) list ./... | grep -v /vendor/)
-TEST= test/centos-image/sshproxy_test.go
+TEST= test/fedora-image/sshproxy_test.go
 EXE= $(addprefix bin/, sshproxy sshproxy-dumpd sshproxy-replay sshproxyctl)
 MANDOC= doc/sshproxy.yaml.5 doc/sshproxy.8 doc/sshproxy-dumpd.8 doc/sshproxy-replay.8 doc/sshproxyctl.8
 PACKAGE = sshproxy_$(SSHPROXY_VERSION)_$(shell uname -s)_$(shell uname -p)

test/README.asciidoc

@@ -8,8 +8,8 @@ The functional tests are run with +docker-compose+. The +run.sh+ script is a
 wrapper to automatically start the tests (e.g. when using +make test+).
 
 Every container is created with the same +Dockerfile+ found in the
-+centos-image+ directory. All scripts started in the containers are located in
-the +centos-image+ directory.
++fedora-image+ directory. All scripts started in the containers are located in
+the +fedora-image+ directory.
 
 The following containers will be created:
 
@@ -31,7 +31,7 @@ server{1,2,3}::
 destinations configured in sshproxy. They all execute an SSH server.
 
 The tests that run on tester use the Go test framework and can be found in the
-+centos-image/sshproxy_test.go+ file.
++fedora-image/sshproxy_test.go+ file.
 
 How to debug the tests?
 -----------------------
@@ -64,12 +64,12 @@ 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
-[centos@tester ~]$
+[fedora@tester ~]$
 
 We then use the +go test+ command to run the tests:
 
 ------------------------------------------------------------------------------
-[centos@tester ~]$ go test -v -failfast -tags docker sshproxy_test.go
+[fedora@tester ~]$ go test -v -failfast -tags docker sshproxy_test.go
 === RUN TestSimpleConnect
 --- PASS: TestSimpleConnect (1.58s)
 === RUN TestReturnCode

test/docker-compose.yaml

@@ -4,9 +4,9 @@ services:
  tester:
  container_name: tester
  hostname: tester
- build: centos-image
- user: centos
- working_dir: /home/centos
+ build: fedora-image
+ user: fedora
+ working_dir: /home/fedora
  depends_on:
  - gateway1
  - gateway2
@@ -19,7 +19,7 @@ services:
  gateway1:
  container_name: gateway1
  hostname: gateway1
- build: centos-image
+ build: fedora-image
  volumes:
  - ../../sshproxy:/sshproxy
  expose:
@@ -34,7 +34,7 @@ services:
  gateway2:
  container_name: gateway2
  hostname: gateway2
- build: centos-image
+ build: fedora-image
  volumes:
  - ../../sshproxy:/sshproxy
  expose:
@@ -49,7 +49,7 @@ services:
  etcd:
  container_name: etcd
  hostname: etcd
- build: centos-image
+ build: fedora-image
  expose:
  - "2379"
  - "2380"
@@ -58,23 +58,23 @@ services:
  server1:
  container_name: server1
  hostname: server1
- build: centos-image
+ build: fedora-image
  expose:
  - "22"
  command: ["/usr/sbin/sshd", "-Def", "/etc/ssh/sshd_config.server1"]
 
  server2:
  container_name: server2
  hostname: server2
- build: centos-image
+ build: fedora-image
  expose:
  - "22"
  command: ["/usr/sbin/sshd", "-Def", "/etc/ssh/sshd_config.server2"]
 
  server3:
  container_name: server3
  hostname: server3
- build: centos-image
+ build: fedora-image
  expose:
  - "22"
  command: ["/usr/sbin/sshd", "-Def", "/etc/ssh/sshd_config.server1"]

test/centos-image/Dockerfile renamed to test/fedora-image/Dockerfile

@@ -5,16 +5,16 @@ RUN set -ex \
 && yum -y update \
 && yum -y install asciidoc etcd git golang hostname iproute make openssh-server rpm-build procps
 
-# Create centos, user1 and user2 users ; centos and user1 groups
+# Create fedora, user1 and user2 users ; fedora and user1 groups
 RUN set -ex \
-&& useradd centos \
-&& install -d -m0755 -o centos -g centos /home/centos/.ssh \
+&& useradd fedora \
+&& install -d -m0755 -o fedora -g fedora /home/fedora/.ssh \
 && useradd user1 \
 && install -d -m0755 -o user1 -g user1 /home/user1/.ssh \
 && useradd -g user1 user2 \
 && install -d -m0755 -o user2 -g user1 /home/user2/.ssh
 
-# Copy centos public key to root authorized_keys
+# Copy fedora public key to root authorized_keys
 RUN set -ex && install -d -m0700 /root/.ssh
 COPY ./ssh/id_ed25519.pub /root/.ssh/authorized_keys
 RUN chmod 0600 /root/.ssh/authorized_keys
@@ -25,10 +25,10 @@ RUN chmod 0644 /etc/ssh/ssh_config
 COPY ./ssh/ssh_host_ed25519_key* /etc/ssh/
 RUN chmod 0600 /etc/ssh/ssh_host_ed25519_key
 
-# Copy centos ssh keys
-COPY --chown=centos:centos ./ssh/id_ed25519.pub /home/centos/.ssh/authorized_keys
-COPY --chown=centos:centos ./ssh/id_ed25519* ./ssh/known_hosts /home/centos/.ssh/
-RUN chmod 0600 /home/centos/.ssh/id_ed25519 /home/centos/.ssh/authorized_keys
+# Copy fedora ssh keys
+COPY --chown=fedora:fedora ./ssh/id_ed25519.pub /home/fedora/.ssh/authorized_keys
+COPY --chown=fedora:fedora ./ssh/id_ed25519* ./ssh/known_hosts /home/fedora/.ssh/
+RUN chmod 0600 /home/fedora/.ssh/id_ed25519 /home/fedora/.ssh/authorized_keys
 
 # Copy user1 ssh keys
 COPY --chown=user1:user1 ./ssh/id_ed25519.pub /home/user1/.ssh/authorized_keys
@@ -56,4 +56,4 @@ COPY ./gateway.sh /root
 COPY ./etcd.sh /root
 
 # Copy test file for tester
-COPY --chown=centos:centos ./sshproxy_test.go /home/centos/
+COPY --chown=fedora:fedora ./sshproxy_test.go /home/fedora/