Skip to content
This repository has been archived by the owner on Jul 25, 2022. It is now read-only.

Make docker image tarball a required file #2103

Merged
merged 2 commits into from
Jul 24, 2020
Merged

Make docker image tarball a required file #2103

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
156cf42
Make docker image tarball a required file
jgrund Jul 23, 2020
2fa3c42
Apply suggestions from code review
jgrund Jul 23, 2020
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
2 changes: 1 addition & 1 deletion iml-docker.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ StandardError=journal
StandardOutput=journal
EnvironmentFile=-/etc/iml-docker/setup/config
WorkingDirectory=/etc/iml-docker
ExecStartPre=-/usr/bin/docker load -i /var/tmp/iml-images.tgz
ExecStartPre=-/usr/bin/docker load -i /var/lib/iml-images.tgz
ExecStart=/usr/bin/docker stack deploy -c docker-compose.yml -c docker-compose.overrides.yml iml --resolve-image=never
ExecStart=/bin/bash -c 'until /usr/bin/iml server list > /dev/null 2>&1; do sleep 1; done'
ExecStop=/usr/bin/docker stack rm iml
Expand Down
10 changes: 5 additions & 5 deletions iml-docker.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,22 @@ Requires: sed
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_sysconfdir}/iml-docker/setup/branding
mkdir -p %{buildroot}%{_tmppath}
mkdir -p %{buildroot}%{_sharedstatedir}
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_unitdir}
cp docker-compose.yml %{buildroot}%{_sysconfdir}/iml-docker
mv iml-images.tgz %{buildroot}%{_tmppath}
mv iml-images.tgz %{buildroot}%{_sharedstatedir}
mv iml-cli-proxy.sh %{buildroot}%{_bindir}/iml
mv update-embedded.sh %{buildroot}%{_bindir}/update-embedded
mv iml-docker.service %{buildroot}%{_unitdir}


%files
%{_sysconfdir}/iml-docker
%attr(750, root, root) %config(missingok) %{_tmppath}/iml-images.tgz
%attr(754, root, root) %{_bindir}/iml
%attr(0640, root, root) %{_sharedstatedir}/iml-images.tgz
%attr(0755, root, root) %{_bindir}/iml
%attr(754, root, root) %{_bindir}/update-embedded
%attr(0644,root,root) %{_unitdir}/iml-docker.service
%attr(0644, root, root) %{_unitdir}/iml-docker.service


%post
Expand Down