Skip to content

USHIFT-19: fix location of example configuration file in RPM #919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Sep 1, 2022
Merged

USHIFT-19: fix location of example configuration file in RPM #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bf1201
USHIFT-19: fix location of example configuration file in RPM
dhellmann Sep 1, 2022
b073099
restore example-user-containers.yaml in packaging directory
dhellmann Sep 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 packaging/microshift/microshift.yaml → packaging/microshift/config.yaml
View file
Open in desktop
File renamed without changes.
35 changes: 35 additions & 0 deletions packaging/rpm/example-user-containers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# The cold replica-rpm containers can be built using paack:
# ./paack.py rpm example-user-containers.yaml fedora-35-aarch64
packages:
- name: my-application-containers
version: 1.0.0
release: 2
license: Apache License 2.0
summary: Application specific containers
description: |
This package provides a read only storage for the deployed application containers.
url: https://github.com/openshift/microshift
path: /usr/lib/user-app/containers
arch:
- name: x86_64
image_arch: amd64
images:
- docker.io/library/nginx:1.21.6
- name: aarch64
image_arch: arm64
images:
- docker.io/library/nginx:1.21.6

- name: my-application-manifests
version: 1.0.0
release: 2
license: Apache License 2.0
summary: Application specific manifests
description: |
This package provides a manifests for the deployed application containers.
manifestPath: /usr/lib/microshift/manifests
arch:
- name: x86_64
manifests: ./example-manifests
- name: aarch64
manifests: ./example-manifests
4 changes: 2 additions & 2 deletions packaging/rpm/microshift.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ install -d -m755 %{buildroot}/%{_unitdir}
install -p -m644 packaging/systemd/microshift.service %{buildroot}%{_unitdir}/microshift.service

install -d -m755 %{buildroot}/%{_sysconfdir}/microshift
install -p -m644 packaging/microshift/microshift.yaml %{buildroot}%{_sysconfdir}/microshift/microshift.yaml
install -p -m644 packaging/microshift/config.yaml %{buildroot}%{_sysconfdir}/microshift/config.yaml

# Memory tweaks to the OpenvSwitch services
mkdir -p -m755 %{buildroot}%{_sysconfdir}/systemd/system/ovs-vswitchd.service.d
Expand Down Expand Up @@ -233,7 +233,7 @@ systemctl enable --now --quiet openvswitch || true
%{_bindir}/cleanup-all-microshift-data
%{_unitdir}/microshift.service
%{_sysconfdir}/crio/crio.conf.d/microshift.conf
%{_sysconfdir}/microshift/microshift.yaml
%{_sysconfdir}/microshift/config.yaml

%files selinux

Expand Down