Commit Graph

25 Commits

Author SHA1 Message Date
Tuomas Katila
18bd45f239 Revert "revertme: upgrade unstable-slim demo images to update libc"
This reverts commit 569d06debb.
2024-05-22 10:35:41 +03:00
Tuomas Katila
569d06debb revertme: upgrade unstable-slim demo images to update libc
Workaround for libc updating during compilation (vs. base image)
Also stop image publish for these images for the time being.

Signed-off-by: Tuomas Katila <tuomas.katila@intel.com>
2024-05-07 17:34:39 +03:00
Mikko Ylinen
009684ea61 demo: update opae-nlb-demo to 2.2.0-1
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
2023-07-17 12:48:46 +03:00
Tuomas Katila
e9267e43c9 Improve dockerfiles based on feedback from hadolint
Co-authored-by: Mikko Ylinen <mikko.ylinen@intel.com>
Signed-off-by: Tuomas Katila <tuomas.katila@intel.com>
2022-10-14 08:22:57 +03:00
Ed Bartosh
7e92c3c1aa switch back to debian:unstable-slim as a base
We had to switch to debian unstable earlier due to a
mismatch in glibc versions in the debian-unstrable-slim and
debian-testing-slim images and Debian package repositories.

This issue has been fixed:
https://github.com/debuerreotype/docker-debian-artifacts/issues/168
so we can switch back.
2022-08-24 11:29:13 +03:00
Ed Bartosh
7aff35ea2d fpga,dsa,iaa: Fix CI issue
Due to a glibc version mismatch in the debian repos and the
unstable-slim and testing-slim docker image 3 CI jobs have been failing
for some time. The issue was fixed by switching to testing-slim base image
and started again when the bug was introduced to the image.

Using testing-slim image as a base should fix the issue.

Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
2022-08-17 12:11:13 +03:00
Ed Bartosh
70c9a55029 fpga,dsa,iaa: Fix CI issue
Due to a glibc version mismatch in the debian repos and the
unstable-slim docker image 3 CI jobs have been failing last several days.

Using testing-slim image as a base should fix the issue.
2022-08-11 20:37:07 +03:00
Ed Bartosh
82337ffc08 fix e2e-fpga failure
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
2022-04-25 00:18:05 +03:00
Ed Bartosh
625ba64620 opae-nlb-demo: switch to Debian unstable 2022-04-22 10:58:16 +03:00
Ed Bartosh
6bac12008e opae-nlb-demo: use libjson-c 5.0
Getting rid of vulnerable libjson version should fix
vulnerability CVE-2020-12762

Fixes: #904

Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
2022-04-19 18:19:27 +03:00
Mikko Ylinen
fd034118b0 images: update license obligations
In Debian, uuid and uuid-dev are totally different things.
accel-config build depends on uuid-dev headers but the runtime
library is libuuid1. This is part of debian:sid-slim so we can
just drop installing uuid. Moreover, it's sufficient that we
only ship accel-config source.

Also, correctly ship OPAE SDK COPYING in the final image.

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
2022-01-14 13:59:11 +02:00
Mikko Ylinen
b3aaecb771 demo: update opae-nlb-demo to use libjson-c4 builder
libjson-c4 is dropped from Debian Unstable so change to
use the original copy from the builder.

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
2021-12-23 13:46:58 +02:00
Oleg Zhurakivskyy
63f2f16f8d opae-nlb-demo: Include libjson-c4 sources
Signed-off-by: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
2021-11-30 17:02:41 +02:00
Ed Bartosh
7310de2336 Switch opae-nlb-demo to Debian
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
2021-09-15 14:57:06 +03:00
Mikko Ylinen
380cd055e7 opae-nlb-demo: fix GCC 11 errors
With GCC 11, the build triggers errors:

/usr/src/opae/opae-sdk-1.5.0-2/opae-libs/include/opae/log.h:51:1: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
   51 | if (p > file)                                                  \
      | ^~
...

Workaround the problem with -Wno-misleading-indentation.

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
2021-05-05 07:59:28 +03:00
DougTW
3992126edf Edited demo opae-nlb-demo dockerfile. Replaced 'master' with 'main' on line 8.
Signed-off-by: DougTW <doug.martin@intel.com>
2021-02-12 10:08:35 -08:00
Ed Bartosh
f16c0936af FPGA: upgrade OPAE to v.1.5.0-2
Upgraded OPAE to the latest release
Tested opae-nlb-demo image on the host with Arria10 hardware

Fixes: #383
2020-09-16 12:35:33 +03:00
Mikko Ylinen
de529da631 demo: opae-nlb-demo: restore Clear Linux workaround
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
2020-06-01 10:50:32 +03:00
Mikko Ylinen
3b9c57656d images: make os-core install implicit
swupd os-install fails (clearlinux/swupd-client/issues/1369) if
"--bundles=os-core" is used. It was confirmed that os-core is
always installed first regardless of what other --bundles are
specified.

To get the builds working, we move to rely on that implicit os-core
install.

Fixes: #330

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
2020-03-12 18:55:01 +02:00
Dmitry Rozhkov
4e2855dc0f
Merge pull request #247 from bart0sh/PR0068-opae-1.4.0-1
Upgrade OPAE to v1.4.0-1
2020-01-16 16:09:44 +02:00
Ed Bartosh
14729fb1a9 Upgrade OPAE to v1.4.0-1 2020-01-15 11:01:25 +02:00
Ed Bartosh
69bb5c42cb Fix opae-demo-nlb build
- Removed Sphynx from the list of bundles as it brings python-basic3,
  which triggers this exception:

Step 9/18 : RUN cd /usr/src/opae/opae-sdk-${OPAE_RElEASE} &&     patch -p1 < 0001-OPAE-in-containers-don-t-enumerate-missing-device.patch &&     mkdir build &&     cd build &&     cmake .. -DBUILD_ASE=0 -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=true &&     make xfpga nlb0 nlb3
...
-- Found Sphinx: /usr/sbin/sphinx-build
-- Found PythonInterp: /usr/sbin/python (found suitable version "3.8.1", minimum required is "2.7")
-- Found Perl: /usr/sbin/perl (found version "5.28.2")
-- Found PythonInterp: /usr/sbin/python (found version "3.8.1")
Traceback (most recent call last):
  File "/usr/src/opae/opae-sdk-1.3.2-1/build/platforms/scripts/afu_platform_config_main/do_zip.py", line 8, in <module>
    wr_buf.write('#!/usr/bin/env python' + os.linesep)
TypeError: a bytes-like object is required, not 'str'
Traceback (most recent call last):
  File "/usr/src/opae/opae-sdk-1.3.2-1/build/platforms/scripts/afu_platform_info_main/do_zip.py", line 8, in <module>
    wr_buf.write('#!/usr/bin/env python' + os.linesep)
TypeError: a bytes-like object is required, not 'str'
Traceback (most recent call last):
  File "/usr/src/opae/opae-sdk-1.3.2-1/build/tools/extra/packager/packager_main/do_zip.py", line 8, in <module>
    wr_buf.write('#!/usr/bin/env python' + os.linesep)
TypeError: a bytes-like object is required, not 'str'
Traceback (most recent call last):
  File "/usr/src/opae/opae-sdk-1.3.2-1/build/tools/extra/packager/afu_json_mgr_main/do_zip.py", line 8, in <module>
    wr_buf.write('#!/usr/bin/env python' + os.linesep)
TypeError: a bytes-like object is required, not 'str'
Traceback (most recent call last):
  File "/usr/src/opae/opae-sdk-1.3.2-1/build/tools/extra/fpgadiag/fpgalpbk_main/do_zip.py", line 8, in <module>
    wr_buf.write('#!/usr/bin/env python' + os.linesep)
TypeError: a bytes-like object is required, not 'str'
Traceback (most recent call last):
  File "/usr/src/opae/opae-sdk-1.3.2-1/build/tools/extra/fpgadiag/mactest_main/do_zip.py", line 8, in <module>
    wr_buf.write('#!/usr/bin/env python' + os.linesep)
TypeError: a bytes-like object is required, not 'str'
Traceback (most recent call last):
  File "/usr/src/opae/opae-sdk-1.3.2-1/build/tools/extra/fpgadiag/fpgastats_main/do_zip.py", line 8, in <module>
    wr_buf.write('#!/usr/bin/env python' + os.linesep)
TypeError: a bytes-like object is required, not 'str'
2020-01-14 12:18:07 +02:00
Hector Augusto Garcia Baleon
1e8719cebc fpga: Install content in /usr/local for the nlb-demo
Signed-off-by: Hector Augusto Garcia Baleon <hector.augusto.garcia.baleon@intel.com>
2019-12-18 08:56:55 -06:00
Ubuntu
4f28657b6b fpga: fixed documentation and demo 2019-09-10 19:30:20 -05:00
Mikko Ylinen
f596fc593f demo: rename clearlinux-demo-opae to opae-nlb-demo
opae-nlb-demo name is more descriptive about the content and becomes
base image agnostic.

Also, set ENTRYPOINT similar to what we did with other images
and deployment files.

Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>
2019-09-06 21:28:59 +03:00