Skip to content

Commit 754fc13

Browse files
ncounterncounter
committed
Codestyle: replace tab with spaces
1 parent 43c2409 commit 754fc13

File tree

8 files changed

+81
-81
lines changed

8 files changed

+81
-81
lines changed

‎containers/BUILDING.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
## Building
44

5-
- `make` builds all containers
6-
- `make proxy-squid` builds an individual image (autocompletion via TAB works)
7-
- use `make proxy-squid PRODUCT_REPO=https://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head/images/repo/SLE-Module-SUSE-Manager-Proxy-4.3-POOL-x86_64-Media1/` to override product repo URL
8-
- `make push` builds all containers and pushes them to `REGISTRY` (by default, registry.tf.local)
9-
- use `make push REGISTRY=myregistry.intra.net` to override registry name
10-
- `make push-proxy-squid` pushes an individual image
5+
- `make` builds all containers
6+
- `make proxy-squid` builds an individual image (autocompletion via TAB works)
7+
- use `make proxy-squid PRODUCT_REPO=https://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head/images/repo/SLE-Module-SUSE-Manager-Proxy-4.3-POOL-x86_64-Media1/` to override product repo URL
8+
- `make push` builds all containers and pushes them to `REGISTRY` (by default, registry.tf.local)
9+
- use `make push REGISTRY=myregistry.intra.net` to override registry name
10+
- `make push-proxy-squid` pushes an individual image
1111

1212
## Pushing to the Open Build Service
1313

14-
- `make osc-init` checks out the OBS project
15-
- use `make osc-init OSC_PROJECT=my:project` to override the OBS project name
16-
- `make osc-checkin` pushes all containers to their respective OBS projects. A local copy of projects is created in `obs-project`
17-
- `make osc-checkin OSC_API_URL=https://api.suse.de OSC_PROJECT=Devel:Galaxy:Manager:Head:Containers` specifies different API endpoints and projects
14+
- `make osc-init` checks out the OBS project
15+
- use `make osc-init OSC_PROJECT=my:project` to override the OBS project name
16+
- `make osc-checkin` pushes all containers to their respective OBS projects. A local copy of projects is created in `obs-project`
17+
- `make osc-checkin OSC_API_URL=https://api.suse.de OSC_PROJECT=Devel:Galaxy:Manager:Head:Containers` specifies different API endpoints and projects
1818

1919
## Running a local registry (in sumaform)
2020

‎containers/Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ build_targets := $(patsubst %-image,%,$(IMAGES))
1616
build: $(build_targets)
1717

1818
$(build_targets):
19-
cd $@-image ; ${BUILDER} build -t $@ --build-arg PRODUCT_REPO=${PRODUCT_REPO} .
19+
cd $@-image ; ${BUILDER} build -t $@ --build-arg PRODUCT_REPO=${PRODUCT_REPO} .
2020

2121
# push (to registry)
2222
push_targets := $(patsubst %-image,push-%,$(IMAGES))
2323

2424
push: $(push_targets)
2525

2626
$(push_targets): push-%: %
27-
@${BUILDER} tag $< ${REGISTRY}/$<
28-
@${BUILDER} image push --tls-verify=$(REGISTRY_TLS_VERIFY) ${REGISTRY}/$<
27+
@${BUILDER} tag $< ${REGISTRY}/$<
28+
@${BUILDER} image push --tls-verify=$(REGISTRY_TLS_VERIFY) ${REGISTRY}/$<
2929

3030

3131
# init Build Service project
@@ -35,13 +35,13 @@ osc_project_links := $(patsubst %,obs-project/%,$(image_files))
3535
osc-init: obs-project $(osc_project_links)
3636

3737
obs-project:
38-
osc --apiurl ${OSC_API_URL} checkout --output-dir=obs-project ${OSC_PROJECT}
38+
osc --apiurl ${OSC_API_URL} checkout --output-dir=obs-project ${OSC_PROJECT}
3939

4040
.PHONY: $(osc_project_links)
4141
$(osc_project_links):
42-
ln -sf $(patsubst obs-project/%,../../%,$@) $@
42+
ln -sf $(patsubst obs-project/%,../../%,$@) $@
4343

4444
# push sources to Build Service
4545
osc-checkin: osc-init
46-
cd obs-project ; osc addremove -r
47-
cd obs-project ; osc --apiurl ${OSC_API_URL} checkin .
46+
cd obs-project ; osc addremove -r
47+
cd obs-project ; osc --apiurl ${OSC_API_URL} checkin .

‎containers/proxy-httpd-image/_service

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<services>
2-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
3-
<service mode="buildtime" name="replace_using_package_version">
4-
<param name="file">Dockerfile</param>
5-
<param name="regex">%PKG_VERSION%</param>
6-
<param name="parse-version">patch</param>
7-
<param name="package">spacewalk-proxy-common</param>
8-
</service>
9-
<service mode="buildtime" name="docker_label_helper"/>
2+
<service mode="buildtime" name="kiwi_metainfo_helper"/>
3+
<service mode="buildtime" name="replace_using_package_version">
4+
<param name="file">Dockerfile</param>
5+
<param name="regex">%PKG_VERSION%</param>
6+
<param name="parse-version">patch</param>
7+
<param name="package">spacewalk-proxy-common</param>
8+
</service>
9+
<service mode="buildtime" name="docker_label_helper"/>
1010
</services>

‎containers/proxy-salt-broker-image/_service

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<services>
2-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
3-
<service mode="buildtime" name="replace_using_package_version">
4-
<param name="file">Dockerfile</param>
5-
<param name="regex">%PKG_VERSION%</param>
6-
<param name="parse-version">patch</param>
7-
<param name="package">spacewalk-proxy-salt</param>
8-
</service>
9-
<service mode="buildtime" name="docker_label_helper"/>
2+
<service mode="buildtime" name="kiwi_metainfo_helper"/>
3+
<service mode="buildtime" name="replace_using_package_version">
4+
<param name="file">Dockerfile</param>
5+
<param name="regex">%PKG_VERSION%</param>
6+
<param name="parse-version">patch</param>
7+
<param name="package">spacewalk-proxy-salt</param>
8+
</service>
9+
<service mode="buildtime" name="docker_label_helper"/>
1010
</services>

‎containers/proxy-squid-image/_service

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<services>
2-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
3-
<service mode="buildtime" name="replace_using_package_version">
4-
<param name="file">Dockerfile</param>
5-
<param name="regex">%PKG_VERSION%</param>
6-
<param name="parse-version">patch</param>
7-
<param name="package">squid</param>
8-
</service>
9-
<service mode="buildtime" name="docker_label_helper"/>
2+
<service mode="buildtime" name="kiwi_metainfo_helper"/>
3+
<service mode="buildtime" name="replace_using_package_version">
4+
<param name="file">Dockerfile</param>
5+
<param name="regex">%PKG_VERSION%</param>
6+
<param name="parse-version">patch</param>
7+
<param name="package">squid</param>
8+
</service>
9+
<service mode="buildtime" name="docker_label_helper"/>
1010
</services>

‎containers/proxy-ssh-image/_service

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<services>
2-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
3-
<service mode="buildtime" name="replace_using_package_version">
4-
<param name="file">Dockerfile</param>
5-
<param name="regex">%PKG_VERSION%</param>
6-
<param name="parse-version">patch</param>
7-
<param name="package">openssh-server</param>
8-
</service>
9-
<service mode="buildtime" name="docker_label_helper"/>
2+
<service mode="buildtime" name="kiwi_metainfo_helper"/>
3+
<service mode="buildtime" name="replace_using_package_version">
4+
<param name="file">Dockerfile</param>
5+
<param name="regex">%PKG_VERSION%</param>
6+
<param name="parse-version">patch</param>
7+
<param name="package">openssh-server</param>
8+
</service>
9+
<service mode="buildtime" name="docker_label_helper"/>
1010
</services>

‎containers/proxy-tftpd-image/_service

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<services>
2-
<service mode="buildtime" name="kiwi_metainfo_helper"/>
3-
<service mode="buildtime" name="replace_using_package_version">
4-
<param name="file">Dockerfile</param>
5-
<param name="regex">%PKG_VERSION%</param>
6-
<param name="parse-version">patch</param>
7-
<param name="package">tftp</param>
8-
</service>
9-
<service mode="buildtime" name="docker_label_helper"/>
2+
<service mode="buildtime" name="kiwi_metainfo_helper"/>
3+
<service mode="buildtime" name="replace_using_package_version">
4+
<param name="file">Dockerfile</param>
5+
<param name="regex">%PKG_VERSION%</param>
6+
<param name="parse-version">patch</param>
7+
<param name="package">tftp</param>
8+
</service>
9+
<service mode="buildtime" name="docker_label_helper"/>
1010
</services>

‎containers/run-proxy.sh

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,41 @@ IMAGES=(proxy-ssh proxy-httpd proxy-salt-broker proxy-squid proxy-tftpd)
1818

1919
for image in "${IMAGES[@]}"
2020
do
21-
podman pull --tls-verify=false $REGISTRY/$image
21+
podman pull --tls-verify=false $REGISTRY/$image
2222
done
2323

2424
podman pod create --name proxy-pod \
25-
--publish 22:22 \
26-
--publish 8080:8080 \
27-
--publish 443:443 \
28-
--publish 4505:4505 \
29-
--publish 4506:4506 \
30-
--add-host $ADD_HOST
25+
--publish 22:22 \
26+
--publish 8080:8080 \
27+
--publish 443:443 \
28+
--publish 4505:4505 \
29+
--publish 4506:4506 \
30+
--add-host $ADD_HOST
3131

3232
podman run --rm=true -dt --pod proxy-pod \
3333
-v $CONFIG_DIR:/etc/uyuni \
34-
--name proxy-ssh \
35-
$REGISTRY/proxy-ssh
34+
--name proxy-ssh \
35+
$REGISTRY/proxy-ssh
3636

3737
podman run --rm=true -dt --pod proxy-pod \
38-
-v $CONFIG_DIR:/etc/uyuni \
39-
-v $RHN_CACHE_DIR:/var/cache/rhn \
40-
-v $TFTPBOOT_DIR:/srv/tftpboot \
41-
--name proxy-httpd \
42-
$REGISTRY/proxy-httpd
38+
-v $CONFIG_DIR:/etc/uyuni \
39+
-v $RHN_CACHE_DIR:/var/cache/rhn \
40+
-v $TFTPBOOT_DIR:/srv/tftpboot \
41+
--name proxy-httpd \
42+
$REGISTRY/proxy-httpd
4343

4444
podman run --rm=true -dt --pod proxy-pod \
45-
-v $CONFIG_DIR:/etc/uyuni \
46-
--name proxy-salt-broker \
47-
$REGISTRY/proxy-salt-broker
45+
-v $CONFIG_DIR:/etc/uyuni \
46+
--name proxy-salt-broker \
47+
$REGISTRY/proxy-salt-broker
4848

4949
podman run --rm=true -d --pod proxy-pod \
50-
-v $CONFIG_DIR:/etc/uyuni \
51-
-v $SQUID_CACHE_DIR:/var/cache/squid \
52-
--name proxy-squid \
53-
$REGISTRY/proxy-squid
50+
-v $CONFIG_DIR:/etc/uyuni \
51+
-v $SQUID_CACHE_DIR:/var/cache/squid \
52+
--name proxy-squid \
53+
$REGISTRY/proxy-squid
5454

5555
podman run --rm=true -dt --pod proxy-pod \
56-
-v $CONFIG_DIR:/etc/uyuni \
57-
--name proxy-tftpd \
58-
$REGISTRY/proxy-tftpd
56+
-v $CONFIG_DIR:/etc/uyuni \
57+
--name proxy-tftpd \
58+
$REGISTRY/proxy-tftpd

0 commit comments

Comments
 (0)