Skip to content

Commit

Permalink
Adding the innosetup image sources
Browse files Browse the repository at this point in the history
  • Loading branch information
marigostra committed Jun 15, 2024
1 parent 1eeaf35 commit c7be76d
Show file tree
Hide file tree
Showing 13 changed files with 378 additions and 1 deletion.
2 changes: 1 addition & 1 deletion base
3 changes: 3 additions & 0 deletions jenkins-image/build
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash -e

./cli build testjobs/default-agent "$@"
3 changes: 3 additions & 0 deletions jenkins-image/innosetup/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*~
*.iss
*.md
9 changes: 9 additions & 0 deletions jenkins-image/innosetup/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.DS_Store

# no wine / windows executables
*.exe
*.msi

# no wix binary files
*.wixobj
*.wixpdb
Empty file.
80 changes: 80 additions & 0 deletions jenkins-image/innosetup/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
FROM mirror.gcr.io/amake/wine:buster as inno
MAINTAINER Aaron Madlon-Kay <[email protected]>

USER root

RUN apt-get update \
&& apt-get install -y --no-install-recommends procps xvfb \
&& rm -rf /var/lib/apt/lists/*

# get at least error information from wine
ENV WINEDEBUG -all,err+all

# Run virtual X buffer on this port
ENV DISPLAY :99

COPY opt /opt
ENV PATH $PATH:/opt/bin

USER xclient

# InnoSetup ignores dotfiles if they are considered hidden, so set
# ShowDotFiles=Y. But the registry file is written to disk asynchronously, so
# wait for it to be updated before proceeding; see
# https://github.com/amake/innosetup-docker/issues/6
RUN wine reg add 'HKEY_CURRENT_USER\Software\Wine' /v ShowDotFiles /d Y \
&& while [ ! -f /home/xclient/.wine/user.reg ]; do sleep 1; done

# Install Inno Setup binaries
RUN curl -SL "https://files.jrsoftware.org/is/6/innosetup-6.2.2.exe" -o is.exe \
&& wine-x11-run wine is.exe /SP- /VERYSILENT /ALLUSERS /SUPPRESSMSGBOXES /DOWNLOADISCRYPT=1 \
&& rm is.exe

# Install unofficial languages
RUN cd "/home/xclient/.wine/drive_c/Program Files/Inno Setup 6/Languages" \
&& curl -L "https://api.github.com/repos/jrsoftware/issrc/tarball/is-6_2_2" \
| tar xz --strip-components=4 --wildcards "*/Files/Languages/Unofficial/*.isl"

FROM mirror.gcr.io/debian:buster-slim

RUN addgroup --system xusers \
&& adduser \
--home /home/xclient \
--disabled-password \
--shell /bin/bash \
--gecos "user for running an xclient application" \
--ingroup xusers \
--quiet \
xclient

# Install some tools required for creating the image
# Install wine and related packages
RUN dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
locales \
wine \
wine32 \
osslsigncode \
&& rm -rf /var/lib/apt/lists/*

RUN sed -i '/ru_RU.UTF-8/s/^# //g' /etc/locale.gen
RUN locale-gen
ENV LC_ALL ru_RU.UTF-8
ENV LANG ru_RU.UTF-8
ENV LANGUAGE ru_RU.UTF-8

COPY opt /opt
ENV PATH $PATH:/opt/bin

COPY --chown=xclient:xusers --from=inno /home/xclient/.wine /home/xclient/.wine
RUN mkdir /work && chown xclient:xusers -R /work

# Wine really doesn't like to be run as root, so let's use a non-root user
USER xclient
ENV HOME /home/xclient
ENV WINEPREFIX /home/xclient/.wine
ENV WINEARCH win32

WORKDIR /work
ENTRYPOINT ["iscc"]
116 changes: 116 additions & 0 deletions jenkins-image/innosetup/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
CC0 1.0 Universal

Statement of Purpose

The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator and
subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work").

Certain owners wish to permanently relinquish those rights to a Work for the
purpose of contributing to a commons of creative, cultural and scientific
works ("Commons") that the public can reliably and without fear of later
claims of infringement build upon, modify, incorporate in other works, reuse
and redistribute as freely as possible in any form whatsoever and for any
purposes, including without limitation commercial purposes. These owners may
contribute to the Commons to promote the ideal of a free culture and the
further production of creative, cultural and scientific works, or to gain
reputation or greater distribution for their Work in part through the use and
efforts of others.

For these and/or other purposes and motivations, and without any expectation
of additional consideration or compensation, the person associating CC0 with a
Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
and publicly distribute the Work under its terms, with knowledge of his or her
Copyright and Related Rights in the Work and the meaning and intended legal
effect of CC0 on those rights.

1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not limited
to, the following:

i. the right to reproduce, adapt, distribute, perform, display, communicate,
and translate a Work;

ii. moral rights retained by the original author(s) and/or performer(s);

iii. publicity and privacy rights pertaining to a person's image or likeness
depicted in a Work;

iv. rights protecting against unfair competition in regards to a Work,
subject to the limitations in paragraph 4(a), below;

v. rights protecting the extraction, dissemination, use and reuse of data in
a Work;

vi. database rights (such as those arising under Directive 96/9/EC of the
European Parliament and of the Council of 11 March 1996 on the legal
protection of databases, and under any national implementation thereof,
including any amended or successor version of such directive); and

vii. other similar, equivalent or corresponding rights throughout the world
based on applicable law or treaty, and any national implementations thereof.

2. Waiver. To the greatest extent permitted by, but not in contravention of,
applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
and Related Rights and associated claims and causes of action, whether now
known or unknown (including existing as well as future claims and causes of
action), in the Work (i) in all territories worldwide, (ii) for the maximum
duration provided by applicable law or treaty (including future time
extensions), (iii) in any current or future medium and for any number of
copies, and (iv) for any purpose whatsoever, including without limitation
commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
the Waiver for the benefit of each member of the public at large and to the
detriment of Affirmer's heirs and successors, fully intending that such Waiver
shall not be subject to revocation, rescission, cancellation, termination, or
any other legal or equitable action to disrupt the quiet enjoyment of the Work
by the public as contemplated by Affirmer's express Statement of Purpose.

3. Public License Fallback. Should any part of the Waiver for any reason be
judged legally invalid or ineffective under applicable law, then the Waiver
shall be preserved to the maximum extent permitted taking into account
Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
is so judged Affirmer hereby grants to each affected person a royalty-free,
non transferable, non sublicensable, non exclusive, irrevocable and
unconditional license to exercise Affirmer's Copyright and Related Rights in
the Work (i) in all territories worldwide, (ii) for the maximum duration
provided by applicable law or treaty (including future time extensions), (iii)
in any current or future medium and for any number of copies, and (iv) for any
purpose whatsoever, including without limitation commercial, advertising or
promotional purposes (the "License"). The License shall be deemed effective as
of the date CC0 was applied by Affirmer to the Work. Should any part of the
License for any reason be judged legally invalid or ineffective under
applicable law, such partial invalidity or ineffectiveness shall not
invalidate the remainder of the License, and in such case Affirmer hereby
affirms that he or she will not (i) exercise any of his or her remaining
Copyright and Related Rights in the Work or (ii) assert any associated claims
and causes of action with respect to the Work, in either case contrary to
Affirmer's express Statement of Purpose.

4. Limitations and Disclaimers.

a. No trademark or patent rights held by Affirmer are waived, abandoned,
surrendered, licensed or otherwise affected by this document.

b. Affirmer offers the Work as-is and makes no representations or warranties
of any kind concerning the Work, express, implied, statutory or otherwise,
including without limitation warranties of title, merchantability, fitness
for a particular purpose, non infringement, or the absence of latent or
other defects, accuracy, or the present or absence of errors, whether or not
discoverable, all to the greatest extent permissible under applicable law.

c. Affirmer disclaims responsibility for clearing rights of other persons
that may apply to the Work or any use thereof, including without limitation
any person's Copyright and Related Rights in the Work. Further, Affirmer
disclaims responsibility for obtaining any necessary consents, permissions
or other rights required for any use of the Work.

d. Affirmer understands and acknowledges that Creative Commons is not a
party to this document and has no duty or obligation with respect to this
CC0 or use of the Work.

For more information, please see
<https://creativecommons.org/publicdomain/zero/1.0/>
36 changes: 36 additions & 0 deletions jenkins-image/innosetup/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
user := $(shell whoami)
git_branch := $(shell git rev-parse --abbrev-ref HEAD)
docker_tag := $(user)/innosetup:$(git_branch)

.PHONY: build
build: ## Build the Docker image
build:
docker build -t $(docker_tag) .

.PHONY: test
test: ## Test the Docker image
test: clean
docker run --rm -i -v $(PWD):/work $(docker_tag) helloworld.iss
ls -al Output/HelloWorld.exe

.PHONY: shell
shell: ## Open a shell in the Docker container
shell:
docker run --rm -it -v $(PWD):/work --entrypoint /bin/bash $(docker_tag)

.PHONY: push
push: ## Publish to Docker Hub
docker push $(docker_tag)

.PHONY: clean
clean: ## Remove generated files
clean:
rm -rf Output

.PHONY: help
help: ## Show this help text
$(info usage: make [target])
$(info )
$(info Available targets:)
@awk -F ':.*?## *' '/^[^\t].+?:.*?##/ \
{printf " %-24s %s\n", $$1, $$2}' $(MAKEFILE_LIST)
52 changes: 52 additions & 0 deletions jenkins-image/innosetup/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# About
An easy way to create Inno Setup installer packages for Microsoft Windows
directly from your Linux or macOS box.

Author: Aaron Madlon-Kay <[email protected]>

The original version can be found [here](https://github.com/amake/innosetup-docker).


## Provided core packages
This image provides the following core packages in addition to the ones
contained in the parent images:

- [Inno Setup](https://www.jrsoftware.org/isinfo.php) (Unicode version)

# Usage
Run in interactive mode with your source root bound to `/work`; specify your
setup script as the command:

```sh
docker run --rm -i -v $PWD:/work amake/innosetup helloworld.iss
```

Put the following wrapper script in your PATH as e.g. `iscc` to be able to run
just `iscc helloworld.iss`:

```sh
#!/usr/bin/env bash

exec docker run --rm -i -v $PWD:/work amake/innosetup "$@"
```

## Important notes
Be aware that depending on how you mount your code into the container, files
referenced by the setup script may or may not be "visible" within the
container. You probably want to make sure all referenced files are at or below
the directory your script is in. The same applies to the output.

# Known issues
## Wine, X11-related warnings and errors
This image pulls some tricks to get wine and Inno Setup installed and working
headlessly. This results in some yucky looking logs, but it seems to work
anyway.

# Does it work?
Yes. Unlike the various other, similar repos for Dockerized Inno Setup I found
on and around 2019-3-12, this one actually works.

# See also
An article about how to use this as part of a complete editing/building/signing
workflow: [Inno Setup on Linux and
macOS](https://gist.github.com/amake/3e7194e5e61d0e1850bba144797fd797)
21 changes: 21 additions & 0 deletions jenkins-image/innosetup/helloworld.iss
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[Setup]
AppName=EmptyProgram
AppVerName=EmptyProgram 1
UsePreviousAppDir=false
DefaultDirName={autopf}\EmptyProgram
Uninstallable=false
OutputBaseFilename=HelloWorld
PrivilegesRequired=none

[Messages]
SetupAppTitle=My Title

[Files]
Source:"*"; DestDir: "{app}";

[Code]
function InitializeSetup(): Boolean;
begin
MsgBox('Hello world.', mbInformation, MB_OK);
Result := FALSE;
end;
31 changes: 31 additions & 0 deletions jenkins-image/innosetup/opt/bin/iscc
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/sh

set -eu

escone() {
printf %s\\n "$1" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/"
}

winpaths() {
for arg; do
if [ -e "$arg" ]; then
escone "$(winepath -w "$arg")"
else
escone "$arg"
fi
done
echo " "
}

winenv() {
wine cmd /c "echo $1" | tr -d '\r'
}

PROGFILES_PATH="$(winepath -u "$(winenv %PROGRAMFILES%)")"

INNO_BIN="Inno Setup 6/ISCC.exe"
INNO_PATH="${PROGFILES_PATH}/${INNO_BIN}"

eval set -- "$(winpaths "$@")"

exec wine "$INNO_PATH" "$@"
15 changes: 15 additions & 0 deletions jenkins-image/innosetup/opt/bin/waitonprocess
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/sh

# inspired by https://stackoverflow.com/a/10407912

COUNT=0
echo "Start waiting on $@"
while pgrep -u xclient "$@" > /dev/null; do
echo "waiting ..."
sleep 1;
COUNT=$((COUNT+1))
if [ $COUNT -eq 60 ]; then
exit 3;
fi
done
echo "$@ completed"
11 changes: 11 additions & 0 deletions jenkins-image/innosetup/opt/bin/wine-x11-run
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh

Xvfb $DISPLAY &
tokill=$!
wine wineboot --init
waitonprocess wineserver
"$@"
retval=$?
kill -15 $tokill
wine wineboot --shutdown
return $retval

0 comments on commit c7be76d

Please sign in to comment.