Skip to content
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.

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

Spec file and systemd packaging updates #381

Merged
merged 4 commits into from
Jan 5, 2022

Conversation

slagle
Copy link
Contributor

@slagle slagle commented Jan 5, 2022

  • Move spec file into rpm dir
  • Package systemd unit files
  • Build locally with git ref
  • Conditionally create builder user

- The spec file is moved outside the container-build dir and into its
  own rpm dir. The tools/build-rpms.sh script and Containerfile are
  updated to handle the move.

- The .tox dir is excluded from the tarball generation
  during the rpm build as it can be quite large in size and is not
  needed for packaging.

- The contrib/build dir is removed at the beginning of the
  tools/build-rpms.sh script as it may be left over from previous runs.

Signed-off-by: James Slagle <jslagle@redhat.com>
@slagle slagle force-pushed the directord-bootstrap branch 3 times, most recently from 53e20c2 to 4950ecd Compare January 5, 2022 20:47
Updates the spec file to package systemd unit files within
directord-server and directord-client subpackages.

The command to generate the systemd unit files is also updated to use
the packaged files, which will be available under the data directory
(sys.prefix + share/directord).

Signed-off-by: James Slagle <jslagle@redhat.com>
When using rpm-build.sh, the package is now versioned with the git ref
instead of the hardcoded release version.

Signed-off-by: James Slagle <jslagle@redhat.com>
If the builder user already exists, allow the container build to
continue. This can be a time saver for development purposes when
re-using an existing container image as the base image for the build.

Signed-off-by: James Slagle <jslagle@redhat.com>
@cloudnull cloudnull merged commit b69ae95 into oshied:main Jan 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants