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.

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

Clam 2522 1.3.0 docker images #41

Merged
merged 5 commits into from
Feb 7, 2024
Merged

Clam 2522 1.3.0 docker images #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b844fd4
Add ClamAV 1.3, remove ClamAV 1.1
micahsnyder Feb 5, 2024
ec6c9eb
clamav, clamav-debian READMEs: better explain how to do image builds
micahsnyder Feb 5, 2024
6adacff
clamav (alpine): remove Cargo.lock file
micahsnyder Feb 5, 2024
75eaad7
clamav, clamav-debian: 1.2 is no longer latest
micahsnyder Feb 6, 2024
377b6b3
clamav, clamav-debian: bump minor versions for 1.2.2, 1.0.5 patch rel…
micahsnyder Feb 6, 2024
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
1,159 changes: 0 additions & 1,159 deletions clamav/1.0/alpine/Cargo.lock
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion clamav/1.0/alpine/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ properties([
string(name: 'IMAGE_NAME', defaultValue: 'clamav', description: 'The docker image name to use'),
string(name: 'REPOSITORY', defaultValue: 'https://github.com/Cisco-Talos/clamav.git', description: 'The repository from which to build'),
string(name: 'BRANCH', defaultValue: 'rel/1.0', description: 'The repository branch for this build'),
string(name: 'FULL_VERSION', defaultValue: '1.0.4', description: 'Full version in X.Y.Z format'),
string(name: 'FULL_VERSION', defaultValue: '1.0.5', description: 'Full version in X.Y.Z format'),
string(name: 'FEATURE_VERSION', defaultValue: '1.0', description: 'Feature version in X.Y format'),
booleanParam(name: 'IS_LATEST', defaultValue: false, description: 'If "true", will also publish to :latest, and :stable tags.'),
]),
Expand Down
2 changes: 1 addition & 1 deletion clamav/1.0/debian/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ properties([
string(name: 'IMAGE_NAME', defaultValue: 'clamav-debian', description: 'The docker image name to use'),
string(name: 'REPOSITORY', defaultValue: 'https://github.com/Cisco-Talos/clamav.git', description: 'The repository from which to build'),
string(name: 'BRANCH', defaultValue: 'rel/1.0', description: 'The repository branch for this build'),
string(name: 'FULL_VERSION', defaultValue: '1.0.4', description: 'Full version in X.Y.Z format'),
string(name: 'FULL_VERSION', defaultValue: '1.0.5', description: 'Full version in X.Y.Z format'),
string(name: 'FEATURE_VERSION', defaultValue: '1.0', description: 'Feature version in X.Y format'),
booleanParam(name: 'IS_LATEST', defaultValue: false, description: 'If "true", will also publish to :latest, and :stable tags.'),
]),
Expand Down
4 changes: 2 additions & 2 deletions clamav/1.2/alpine/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ properties([
string(name: 'IMAGE_NAME', defaultValue: 'clamav', description: 'The docker image name to use'),
string(name: 'REPOSITORY', defaultValue: 'https://github.com/Cisco-Talos/clamav.git', description: 'The repository from which to build'),
string(name: 'BRANCH', defaultValue: 'rel/1.2', description: 'The repository branch for this build'),
string(name: 'FULL_VERSION', defaultValue: '1.2.1', description: 'Full version in X.Y.Z format'),
string(name: 'FULL_VERSION', defaultValue: '1.2.2', description: 'Full version in X.Y.Z format'),
string(name: 'FEATURE_VERSION', defaultValue: '1.2', description: 'Feature version in X.Y format'),
booleanParam(name: 'IS_LATEST', defaultValue: true, description: 'If "true", will also publish to :latest, and :stable tags.'),
booleanParam(name: 'IS_LATEST', defaultValue: false, description: 'If "true", will also publish to :latest, and :stable tags.'),
]),
disableConcurrentBuilds(),
buildDiscarder(logRotator(
Expand Down
4 changes: 2 additions & 2 deletions clamav/1.2/debian/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ properties([
string(name: 'IMAGE_NAME', defaultValue: 'clamav-debian', description: 'The docker image name to use'),
string(name: 'REPOSITORY', defaultValue: 'https://github.com/Cisco-Talos/clamav.git', description: 'The repository from which to build'),
string(name: 'BRANCH', defaultValue: 'rel/1.2', description: 'The repository branch for this build'),
string(name: 'FULL_VERSION', defaultValue: '1.2.1', description: 'Full version in X.Y.Z format'),
string(name: 'FULL_VERSION', defaultValue: '1.2.2', description: 'Full version in X.Y.Z format'),
string(name: 'FEATURE_VERSION', defaultValue: '1.2', description: 'Feature version in X.Y format'),
booleanParam(name: 'IS_LATEST', defaultValue: true, description: 'If "true", will also publish to :latest, and :stable tags.'),
booleanParam(name: 'IS_LATEST', defaultValue: false, description: 'If "true", will also publish to :latest, and :stable tags.'),
]),
disableConcurrentBuilds(),
buildDiscarder(logRotator(
Expand Down
0 clamav/1.1/alpine/Dockerfile → clamav/1.3/alpine/Dockerfile
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions clamav/1.1/alpine/Jenkinsfile → clamav/1.3/alpine/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ properties([
string(name: 'NAMESPACE', defaultValue: 'clamav', description: 'The docker namespace to use'),
string(name: 'IMAGE_NAME', defaultValue: 'clamav', description: 'The docker image name to use'),
string(name: 'REPOSITORY', defaultValue: 'https://github.com/Cisco-Talos/clamav.git', description: 'The repository from which to build'),
string(name: 'BRANCH', defaultValue: 'rel/1.1', description: 'The repository branch for this build'),
string(name: 'FULL_VERSION', defaultValue: '1.1.3', description: 'Full version in X.Y.Z format'),
string(name: 'FEATURE_VERSION', defaultValue: '1.1', description: 'Feature version in X.Y format'),
booleanParam(name: 'IS_LATEST', defaultValue: false, description: 'If "true", will also publish to :latest, and :stable tags.'),
string(name: 'BRANCH', defaultValue: 'rel/1.3', description: 'The repository branch for this build'),
string(name: 'FULL_VERSION', defaultValue: '1.3.0', description: 'Full version in X.Y.Z format'),
string(name: 'FEATURE_VERSION', defaultValue: '1.3', description: 'Feature version in X.Y format'),
booleanParam(name: 'IS_LATEST', defaultValue: true, description: 'If "true", will also publish to :latest, and :stable tags.'),
]),
disableConcurrentBuilds(),
buildDiscarder(logRotator(
Expand Down
0 clamav/1.1/alpine/scripts/clamdcheck.sh → clamav/1.3/alpine/scripts/clamdcheck.sh
View file
Open in desktop
File renamed without changes.
0 ...scripts/docker-entrypoint-unprivileged.sh → ...scripts/docker-entrypoint-unprivileged.sh
View file
Open in desktop
File renamed without changes.
0 ...v/1.1/alpine/scripts/docker-entrypoint.sh → ...v/1.3/alpine/scripts/docker-entrypoint.sh
View file
Open in desktop
File renamed without changes.
0 clamav/1.1/alpine/scripts/update_db_image.sh → clamav/1.3/alpine/scripts/update_db_image.sh
View file
Open in desktop
File renamed without changes.
0 clamav/1.1/debian/Dockerfile → clamav/1.3/debian/Dockerfile
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions clamav/1.1/debian/Jenkinsfile → clamav/1.3/debian/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ properties([
string(name: 'NAMESPACE', defaultValue: 'clamav', description: 'The docker namespace to use'),
string(name: 'IMAGE_NAME', defaultValue: 'clamav-debian', description: 'The docker image name to use'),
string(name: 'REPOSITORY', defaultValue: 'https://github.com/Cisco-Talos/clamav.git', description: 'The repository from which to build'),
string(name: 'BRANCH', defaultValue: 'rel/1.1', description: 'The repository branch for this build'),
string(name: 'FULL_VERSION', defaultValue: '1.1.3', description: 'Full version in X.Y.Z format'),
string(name: 'FEATURE_VERSION', defaultValue: '1.1', description: 'Feature version in X.Y format'),
booleanParam(name: 'IS_LATEST', defaultValue: false, description: 'If "true", will also publish to :latest, and :stable tags.'),
string(name: 'BRANCH', defaultValue: 'rel/1.3', description: 'The repository branch for this build'),
string(name: 'FULL_VERSION', defaultValue: '1.3.0', description: 'Full version in X.Y.Z format'),
string(name: 'FEATURE_VERSION', defaultValue: '1.3', description: 'Feature version in X.Y format'),
booleanParam(name: 'IS_LATEST', defaultValue: true, description: 'If "true", will also publish to :latest, and :stable tags.'),
]),
disableConcurrentBuilds(),
buildDiscarder(logRotator(
Expand Down
0 clamav/1.1/debian/scripts/clamdcheck.sh → clamav/1.3/debian/scripts/clamdcheck.sh
View file
Open in desktop
File renamed without changes.
0 ...scripts/docker-entrypoint-unprivileged.sh → ...scripts/docker-entrypoint-unprivileged.sh
View file
Open in desktop
File renamed without changes.
0 ...v/1.1/debian/scripts/docker-entrypoint.sh → ...v/1.3/debian/scripts/docker-entrypoint.sh
View file
Open in desktop
File renamed without changes.
0 clamav/1.1/debian/scripts/update_db_image.sh → clamav/1.3/debian/scripts/update_db_image.sh
View file
Open in desktop
File renamed without changes.
23 changes: 17 additions & 6 deletions clamav/README-alpine.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,25 @@ You can use the `unstable` version (i.e. `clamav/clamav:unstable` or
## Building the ClamAV image

While it is recommended to pull the image from our
[Docker Hub registry](https://hub.docker.com/u/clamav/clamav), some may want
to build the image locally instead. All that is needed is:
[Docker Hub registry](https://hub.docker.com/u/clamav/clamav), some may
want to build the image locally instead.

To do so, you must get a copy of the ClamAV source code such as a gitclone of
the [ClamAV GitHub source](https://github.com/Cisco-Talos/clamav).
Then copy in the relevant `Dockerfile` and `scripts/` directory for your
ClamAV version from
[the ClamAV Docker repository](https://github.com/Cisco-Talos/clamav-docker/tree/main/clamav).
Then you can build your image. E.g.:
```bash
git clone https://github.com/Cisco-Talos/clamav-docker.git
git clone --depth 1 https://github.com/Cisco-Talos/clamav.git --branch rel/1.2

cp -r clamav-docker/clamav/1.2/alpine/Dockerfile clamav/.
cp -r clamav-docker/clamav/1.2/alpine/scripts clamav/.
cd clamav

docker build --tag "clamav:TICKET-123" .
```
in the current directory. This will build the ClamAV image and tag it with
the name "clamav:TICKET-123". Any name can generally be used and it is this
name that needs to be referred to later when running the image.

## Running ClamD

Expand Down Expand Up @@ -192,7 +203,7 @@ To do so, you have two options:
If you're thinking about running multiple containers that share a single
database volume, [here are some notes on how this might work](#multiple-containers-sharing-the-same-mounted-databases).

### Running ClamD using non-root user using --user and --entrypoint
### Running ClamD using non-root user using --user and --entrypoint

You can run a container using the non-root user "clamav" with the unprivileged entrypoint script. To do this with Docker, you will need to add these two options: `--user "clamav" --entrypoint /init-unprivileged`
For example:
Expand Down
23 changes: 17 additions & 6 deletions clamav/README-debian.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,25 @@ branch.
## Building the ClamAV image

While it is recommended to pull the image from our
[Docker Hub registry](https://hub.docker.com/u/clamav/clamavv-debian), some may
want to build the image locally instead. All that is needed is:
[Docker Hub registry](https://hub.docker.com/u/clamav/clamav-debian), some may
want to build the image locally instead.

To do so, you must get a copy of the ClamAV source code such as a gitclone of
the [ClamAV GitHub source](https://github.com/Cisco-Talos/clamav).
Then copy in the relevant `Dockerfile` and `scripts/` directory for your
ClamAV version from
[the ClamAV Docker repository](https://github.com/Cisco-Talos/clamav-docker/tree/main/clamav).
Then you can build your image. E.g.:
```bash
git clone https://github.com/Cisco-Talos/clamav-docker.git
git clone --depth 1 https://github.com/Cisco-Talos/clamav.git --branch rel/1.2

cp -r clamav-docker/clamav/1.2/debian/Dockerfile clamav/.
cp -r clamav-docker/clamav/1.2/debian/scripts clamav/.
cd clamav

docker build --tag "clamav:TICKET-123" .
```
in the current directory. This will build the ClamAV image and tag it with
the name "clamav:TICKET-123". Any name can generally be used and it is this
name that needs to be referred to later when running the image.

## Running ClamD

Expand Down Expand Up @@ -202,7 +213,7 @@ To do so, you have two options:
If you're thinking about running multiple containers that share a single
database volume, [here are some notes on how this might work](#multiple-containers-sharing-the-same-mounted-databases).

### Running ClamD using non-root user using --user and --entrypoint
### Running ClamD using non-root user using --user and --entrypoint

You can run a container using the non-root user "clamav" with the unprivileged entrypoint script. To do this with Docker, you will need to add these two options: `--user "clamav" --entrypoint /init-unprivileged`
For example:
Expand Down