-
Notifications
You must be signed in to change notification settings - Fork 2
Add 3.11 to images with newer openssl as needed #93
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
Open
emlowe
wants to merge
7
commits into
main
Choose a base branch
from
EL.add-3.11
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
0458032
Add 3.11 to images with newer openssl as needed - also update sqlite
emlowe 3d6839f
Update Dockerfile
emlowe a14b2f8
Update Dockerfile
emlowe ca45283
Simplify PR
emlowe ba1232d
undo changes to risc image
emlowe 9662b02
Run the pip install commands for 3.11 as well
emlowe 38366a0
minor reordering of steps for clarity
emlowe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,25 +17,44 @@ RUN yum -y groupinstall "Development Tools" && \ | |
|
|
||
| # Compile newer version of sqlite3 | ||
| RUN cd ~ && \ | ||
| wget -q https://sqlite.org/2022/sqlite-autoconf-3400100.tar.gz && \ | ||
| tar -xzf sqlite-autoconf-3400100.tar.gz && \ | ||
| cd sqlite-autoconf-3400100 && \ | ||
| wget -q https://www.sqlite.org/2024/sqlite-autoconf-3450100.tar.gz && \ | ||
| tar -xzf sqlite-autoconf-3450100.tar.gz && \ | ||
| cd sqlite-autoconf-3450100 && \ | ||
| CFLAGS="-DSQLITE_MAX_VARIABLE_NUMBER=500000" ./configure --prefix=/usr/sqlite3 && \ | ||
| make && \ | ||
| make install && \ | ||
| cd ~ && \ | ||
| rm -rf ~/sqlite-autoconf* | ||
|
|
||
| RUN cd ~ && \ | ||
| yum -y install perl-IPC-Cmd perl-Pod-Html && \ | ||
| wget -q https://github.com/openssl/openssl/releases/download/openssl-3.0.15/openssl-3.0.15.tar.gz && \ | ||
| tar -xzf openssl-3.0.15.tar.gz && \ | ||
| cd openssl-3.0.15 && \ | ||
| ./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl --libdir=lib no-ssl3 no-idea no-dtls no-srp no-comp shared && \ | ||
| make && \ | ||
| make install && \ | ||
| cd ~ && \ | ||
| rm -rf ~/openssl-3.0.15* | ||
|
|
||
| # Compile newer version of python3 | ||
| RUN yum -y install openssl openssl-devel zlib-devel bzip2 bzip2-devel readline-devel tk-devel libffi-devel xz-devel && \ | ||
| cd ~ && \ | ||
| # Set up pyenv \ | ||
| git clone https://github.com/pyenv/pyenv.git ~/.pyenv && \ | ||
| pyenv install 3.10 && \ | ||
| # setup python 3.10 \ | ||
| PYTHON_CONFIGURE_OPTS="--enable-shared --enable-optimizations" pyenv install 3.10 && \ | ||
|
altendky marked this conversation as resolved.
Outdated
|
||
| # setup python 3.11 w/ openssl 3 \ | ||
| PYTHON_CONFIGURE_OPTS="--with-openssl=/usr/local/ssl --with-openssl-rpath=auto --enable-shared --enable-optimizations" pyenv install 3.11 && \ | ||
|
altendky marked this conversation as resolved.
Outdated
|
||
| pyenv global 3.10 && \ | ||
| pip install --upgrade pip && \ | ||
| pip install --no-cache-dir py3createtorrent awscli && \ | ||
|
Comment on lines
48
to
49
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. so long as we're doing for one, should do for both pythons? also in other files. |
||
| python3 -c 'import sys; import sqlite3; sys.exit(sqlite3.sqlite_version != "3.40.1")' && \ | ||
| python3 -c 'import sys; import sqlite3; sys.exit(sqlite3.sqlite_version != "3.45.1")' && \ | ||
|
altendky marked this conversation as resolved.
Outdated
|
||
| pyenv global 3.11 && \ | ||
| pip install --upgrade pip && \ | ||
| pip install --no-cache-dir py3createtorrent awscli && \ | ||
|
altendky marked this conversation as resolved.
|
||
| python3 -c 'import sys; import sqlite3; sys.exit(sqlite3.sqlite_version != "3.45.1")' && \ | ||
| python3 -c 'import sys; import ssl; sys.exit(ssl.OPENSSL_VERSION_INFO != (3,0,0,15,0))' && \ | ||
| yum clean all | ||
|
|
||
| # Add nodejs | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.